From 0af492b4bdb0356ea04e13690b78a236b82bd40c Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Wed, 23 Dec 2015 17:52:36 -0800 Subject: [PATCH] YARN-4156. TestAMRestart#testAMBlacklistPreventsRestartOnSameNode assumes CapacityScheduler. (Anubhav Dhoot via kasha) --- hadoop-yarn-project/CHANGES.txt | 7 +++++-- .../resourcemanager/applicationsmanager/TestAMRestart.java | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index d3f690ec64..08451774dc 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -77,8 +77,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 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 acacc40c4b..6732039169 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 void testNMTokensRebindOnAMRestart() throws Exception { @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); }