You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by ka...@apache.org on 2014/02/25 19:19:47 UTC
svn commit: r1571779 - in
/hadoop/common/branches/branch-2.4/hadoop-yarn-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
Author: kasha
Date: Tue Feb 25 18:19:47 2014
New Revision: 1571779
URL: http://svn.apache.org/r1571779
Log:
YARN-1760. TestRMAdminService assumes CapacityScheduler. (kasha)
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1571779&r1=1571778&r2=1571779&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Tue Feb 25 18:19:47 2014
@@ -315,6 +315,8 @@ Release 2.4.0 - UNRELEASED
transits from standby to active mode so as to assimilate any changes that
happened while it was in standby mode. (Xuan Gong via vinodkv)
+ YARN-1760. TestRMAdminService assumes CapacityScheduler. (kasha)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java?rev=1571779&r1=1571778&r2=1571779&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java Tue Feb 25 18:19:47 2014
@@ -62,7 +62,7 @@ import org.junit.Test;
public class TestRMAdminService {
- private final Configuration configuration = new YarnConfiguration();
+ private Configuration configuration;;
private MockRM rm = null;
private FileSystem fs;
private Path workingPath;
@@ -70,7 +70,7 @@ public class TestRMAdminService {
@Before
public void setup() throws IOException {
- Configuration.addDefaultResource(YarnConfiguration.CS_CONFIGURATION_FILE);
+ configuration = new YarnConfiguration();
fs = FileSystem.get(configuration);
workingPath =
new Path(new File("target", this.getClass().getSimpleName()
@@ -94,9 +94,16 @@ public class TestRMAdminService {
fs.delete(tmpDir, true);
}
+ private void useCapacityScheduler() {
+ configuration.set(YarnConfiguration.RM_SCHEDULER,
+ CapacityScheduler.class.getCanonicalName());
+ configuration.addResource(YarnConfiguration.CS_CONFIGURATION_FILE);
+ }
+
@Test
public void testAdminRefreshQueuesWithLocalConfigurationProvider()
throws IOException, YarnException {
+ useCapacityScheduler();
rm = new MockRM(configuration);
rm.init(configuration);
rm.start();
@@ -119,6 +126,7 @@ public class TestRMAdminService {
throws IOException, YarnException {
configuration.set(YarnConfiguration.RM_CONFIGURATION_PROVIDER_CLASS,
"org.apache.hadoop.yarn.FileSystemBasedConfigurationProvider");
+ useCapacityScheduler();
try {
rm = new MockRM(configuration);
rm.init(configuration);