Repository: hadoop Updated Branches: refs/heads/branch-2.7 54dd9a14a -> 04cc99152
MAPREDUCE-6580. Test failure: TestMRJobsWithProfiler. Contributed by Eric Badger. (cherry picked from commit 0bfe5a0167f0af65f1d7a8bc251a1c404ed41316) (cherry picked from commit 12c1cc889ab955c30a8dc5ed68f1df1a5c557933) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/04cc9915 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/04cc9915 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/04cc9915 Branch: refs/heads/branch-2.7 Commit: 04cc99152f7f8da7c0f14c7bf71634c48068a264 Parents: 54dd9a1 Author: Akira Ajisaka <[email protected]> Authored: Wed Mar 23 13:18:06 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Wed Mar 23 13:23:29 2016 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/04cc9915/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index befcd1e..0ea5726 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/04cc9915/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
