Repository: hadoop Updated Branches: refs/heads/branch-2 a68a9eb2b -> 12c1cc889
MAPREDUCE-6580. Test failure: TestMRJobsWithProfiler. Contributed by Eric Badger. (cherry picked from commit 0bfe5a0167f0af65f1d7a8bc251a1c404ed41316) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12c1cc88 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12c1cc88 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12c1cc88 Branch: refs/heads/branch-2 Commit: 12c1cc889ab955c30a8dc5ed68f1df1a5c557933 Parents: a68a9eb Author: Akira Ajisaka <[email protected]> Authored: Wed Mar 23 13:18:06 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Wed Mar 23 13:19:08 2016 +0900 ---------------------------------------------------------------------- .../org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/12c1cc88/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java index df55f50..cbf1f39 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java +++ b/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
