MAPREDUCE-6580. Test failure: TestMRJobsWithProfiler. Contributed by Eric Badger.

(cherry picked from commit 0bfe5a0167f0af65f1d7a8bc251a1c404ed41316)
(cherry picked from commit 12c1cc889ab955c30a8dc5ed68f1df1a5c557933)

hadoop-mapreduce-project/CHANGES.txt

@@ -61,6 +61,9 @@ Release 2.7.3 - UNRELEASED
     MAPREDUCE-6645. TestWordStats outputs logs under directories other than
     target/test-dir. (Gabor Liptak via aajisaka)
 
+    MAPREDUCE-6580. Test failure: TestMRJobsWithProfiler.
+    (Eric Badger via aajisaka)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java

@@ -134,7 +134,7 @@ public class TestMRJobsWithProfiler {
     if (!useDefault) {
       // use hprof for map to profile.out
       sleepConf.set(MRJobConfig.TASK_MAP_PROFILE_PARAMS,
-          "-agentlib:hprof=cpu=times,heap=sites,force=n,thread=y,verbose=n,"
+          "-agentlib:hprof=cpu=samples,heap=sites,force=n,thread=y,verbose=n,"
               + "file=%s");
 
       // use Xprof for reduce to stdout