Repository: hadoop Updated Branches: refs/heads/branch-2 a98887d8b -> 2f6764547
YARN-4156. TestAMRestart#testAMBlacklistPreventsRestartOnSameNode assumes CapacityScheduler. (Anubhav Dhoot via kasha) (cherry picked from commit 0af492b4bdb0356ea04e13690b78a236b82bd40c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2f676454 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2f676454 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2f676454 Branch: refs/heads/branch-2 Commit: 2f67645475502eb4fe04257c32974e2bba078774 Parents: a98887d Author: Karthik Kambatla <[email protected]> Authored: Wed Dec 23 17:52:36 2015 -0800 Committer: Karthik Kambatla <[email protected]> Committed: Wed Dec 23 17:52:54 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 7 +++++-- .../resourcemanager/applicationsmanager/TestAMRestart.java | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f676454/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5afca7b..8b0a920 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -22,8 +22,11 @@ Release 2.9.0 - UNRELEASED BUG FIXES - YARN-4109. Exception on RM scheduler page loading with labels. - (Mohammad Shahid Khan via rohithsharmaks) + YARN-4109. Exception on RM scheduler page loading with labels. + (Mohammad Shahid Khan via rohithsharmaks) + + YARN-4156. TestAMRestart#testAMBlacklistPreventsRestartOnSameNode + assumes CapacityScheduler. (Anubhav Dhoot via kasha) Release 2.8.0 - UNRELEASED http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f676454/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java index acacc40..6732039 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java @@ -382,6 +382,8 @@ public class TestAMRestart { @Test(timeout = 100000) public void testAMBlacklistPreventsRestartOnSameNode() throws Exception { YarnConfiguration conf = new YarnConfiguration(); + conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class, + ResourceScheduler.class); conf.setBoolean(YarnConfiguration.AM_BLACKLISTING_ENABLED, true); testAMBlacklistPreventRestartOnSameNode(false, conf); }
