You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2015/12/30 07:56:36 UTC
[11/27] hadoop git commit: YARN-4156.
TestAMRestart#testAMBlacklistPreventsRestartOnSameNode assumes
CapacityScheduler. (Anubhav Dhoot via kasha)
YARN-4156. TestAMRestart#testAMBlacklistPreventsRestartOnSameNode assumes CapacityScheduler. (Anubhav Dhoot via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0af492b4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0af492b4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0af492b4
Branch: refs/heads/yarn-2877
Commit: 0af492b4bdb0356ea04e13690b78a236b82bd40c
Parents: 8b1837f
Author: Karthik Kambatla <ka...@cloudera.com>
Authored: Wed Dec 23 17:52:36 2015 -0800
Committer: Karthik Kambatla <ka...@cloudera.com>
Committed: Wed Dec 23 17:52:36 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/0af492b4/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d3f690e..0845177 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0af492b4/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);
}