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 qu...@apache.org on 2022/03/10 13:50:30 UTC
[hadoop] branch trunk updated: YARN-11036. Do not inherit from TestRMWebServicesCapacitySched. Contributed by Tamas Domok
This is an automated email from the ASF dual-hosted git repository.
quapaw pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 383b734 YARN-11036. Do not inherit from TestRMWebServicesCapacitySched. Contributed by Tamas Domok
383b734 is described below
commit 383b73417df80028011d229dce9daf8e4ecbdb49
Author: 9uapaw <gy...@gmail.com>
AuthorDate: Thu Mar 10 13:11:19 2022 +0100
YARN-11036. Do not inherit from TestRMWebServicesCapacitySched. Contributed by Tamas Domok
---
.../webapp/TestRMWebServicesCapacitySched.java | 47 ++++++++++------
...estRMWebServicesCapacitySchedDynamicConfig.java | 65 ++++++----------------
.../TestRMWebServicesSchedulerActivities.java | 31 +++++++++--
3 files changed, 73 insertions(+), 70 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
index 2be9b54..b9ce10a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
@@ -77,42 +77,37 @@ import static org.junit.Assert.assertEquals;
public class TestRMWebServicesCapacitySched extends JerseyTestBase {
- protected static MockRM rm;
+ private MockRM rm;
+
+ public static class WebServletModule extends ServletModule {
+ private final MockRM rm;
+
+ WebServletModule(MockRM rm) {
+ this.rm = rm;
+ }
- private static class WebServletModule extends ServletModule {
@Override
protected void configureServlets() {
bind(JAXBContextResolver.class);
bind(RMWebServices.class);
bind(GenericExceptionHandler.class);
- CapacitySchedulerConfiguration csConf = new CapacitySchedulerConfiguration(
- new Configuration(false));
- setupQueueConfiguration(csConf);
- YarnConfiguration conf = new YarnConfiguration(csConf);
- conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
- ResourceScheduler.class);
- conf.set(YarnConfiguration.RM_PLACEMENT_CONSTRAINTS_HANDLER,
- YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER);
- rm = new MockRM(conf);
bind(ResourceManager.class).toInstance(rm);
serve("/*").with(GuiceContainer.class);
}
}
public TestRMWebServicesCapacitySched() {
- super(new WebAppDescriptor.Builder(
- "org.apache.hadoop.yarn.server.resourcemanager.webapp")
- .contextListenerClass(GuiceServletConfig.class)
- .filterClass(com.google.inject.servlet.GuiceFilter.class)
- .contextPath("jersey-guice-filter").servletPath("/").build());
+ super(createWebAppDescriptor());
}
@Before
@Override
public void setUp() throws Exception {
super.setUp();
+ rm = createMockRM(new CapacitySchedulerConfiguration(
+ new Configuration(false)));
GuiceServletConfig.setInjector(
- Guice.createInjector(new WebServletModule()));
+ Guice.createInjector(new WebServletModule(rm)));
}
public static void setupQueueConfiguration(
@@ -389,4 +384,22 @@ public class TestRMWebServicesCapacitySched extends JerseyTestBase {
Assert.fail("overwrite should not fail " + e.getMessage());
}
}
+
+ public static WebAppDescriptor createWebAppDescriptor() {
+ return new WebAppDescriptor.Builder(
+ TestRMWebServicesCapacitySched.class.getPackage().getName())
+ .contextListenerClass(GuiceServletConfig.class)
+ .filterClass(com.google.inject.servlet.GuiceFilter.class)
+ .contextPath("jersey-guice-filter").servletPath("/").build();
+ }
+
+ public static MockRM createMockRM(CapacitySchedulerConfiguration csConf) {
+ setupQueueConfiguration(csConf);
+ YarnConfiguration conf = new YarnConfiguration(csConf);
+ conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
+ ResourceScheduler.class);
+ conf.set(YarnConfiguration.RM_PLACEMENT_CONSTRAINTS_HANDLER,
+ YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER);
+ return new MockRM(conf);
+ }
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java
index 0e2ecd0..4cc50c4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java
@@ -19,10 +19,7 @@
package org.apache.hadoop.yarn.server.resourcemanager.webapp;
import com.google.inject.Guice;
-import com.google.inject.servlet.ServletModule;
import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
-import com.sun.jersey.test.framework.WebAppDescriptor;
import java.io.IOException;
import java.util.HashMap;
@@ -34,67 +31,28 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.AutoCreatedQueueTemplate;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerQueueManager;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath;
-import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
import org.apache.hadoop.yarn.webapp.GuiceServletConfig;
import org.apache.hadoop.yarn.webapp.JerseyTestBase;
import org.junit.Test;
+import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerTestUtilities.GB;
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestRMWebServicesCapacitySched.assertJsonResponse;
+import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestRMWebServicesCapacitySched.createMockRM;
+import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestRMWebServicesCapacitySched.createWebAppDescriptor;
public class TestRMWebServicesCapacitySchedDynamicConfig extends
JerseyTestBase {
- private static final int GB = 1024;
- private static MockRM rm;
+ private MockRM rm;
private CapacitySchedulerQueueManager autoQueueHandler;
- private static class WebServletModule extends ServletModule {
- private final Configuration conf;
-
- WebServletModule(Configuration conf) {
- this.conf = conf;
- }
-
- @Override
- protected void configureServlets() {
- bind(JAXBContextResolver.class);
- bind(RMWebServices.class);
- bind(GenericExceptionHandler.class);
- conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
- ResourceScheduler.class);
- conf.set(YarnConfiguration.RM_PLACEMENT_CONSTRAINTS_HANDLER,
- YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER);
- rm = new MockRM(conf);
- bind(ResourceManager.class).toInstance(rm);
- serve("/*").with(GuiceContainer.class);
- }
- }
-
- private void initResourceManager(Configuration conf) throws IOException {
- GuiceServletConfig.setInjector(
- Guice.createInjector(new WebServletModule(conf)));
- rm.start();
- //Need to call reinitialize as
- //MutableCSConfigurationProvider with InMemoryConfigurationStore
- //somehow does not load the queues properly and falls back to default config.
- //Therefore CS will think there's only the default queue there.
- ((CapacityScheduler) rm.getResourceScheduler()).reinitialize(conf,
- rm.getRMContext(), true);
- }
-
public TestRMWebServicesCapacitySchedDynamicConfig() {
- super(new WebAppDescriptor.Builder(
- "org.apache.hadoop.yarn.server.resourcemanager.webapp")
- .contextListenerClass(GuiceServletConfig.class)
- .filterClass(com.google.inject.servlet.GuiceFilter.class)
- .contextPath("jersey-guice-filter").servletPath("/").build());
+ super(createWebAppDescriptor());
}
@Test
@@ -327,4 +285,17 @@ public class TestRMWebServicesCapacitySchedDynamicConfig extends
return config;
}
}
+
+ private void initResourceManager(Configuration conf) throws IOException {
+ rm = createMockRM(new CapacitySchedulerConfiguration(conf));
+ GuiceServletConfig.setInjector(
+ Guice.createInjector(new TestRMWebServicesCapacitySched.WebServletModule(rm)));
+ rm.start();
+ //Need to call reinitialize as
+ //MutableCSConfigurationProvider with InMemoryConfigurationStore
+ //somehow does not load the queues properly and falls back to default config.
+ //Therefore CS will think there's only the default queue there.
+ ((CapacityScheduler) rm.getResourceScheduler()).reinitialize(conf,
+ rm.getRMContext(), true);
+ }
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java
index 3fc3c26..ee472da 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java
@@ -18,15 +18,20 @@
package org.apache.hadoop.yarn.server.resourcemanager.webapp;
+import com.google.inject.Guice;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.core.util.MultivaluedMapImpl;
+
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityDiagnosticConstant;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+import org.apache.hadoop.yarn.webapp.GuiceServletConfig;
+import org.apache.hadoop.yarn.webapp.JerseyTestBase;
+import org.junit.Before;
import org.apache.hadoop.http.JettyUtils;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerState;
@@ -83,6 +88,8 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTes
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfNodes;
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyQueueOrder;
import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyStateOfAllocations;
+import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestRMWebServicesCapacitySched.createMockRM;
+import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestRMWebServicesCapacitySched.createWebAppDescriptor;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -91,11 +98,23 @@ import static org.junit.Assert.assertTrue;
/**
* Tests for scheduler/app activities.
*/
-public class TestRMWebServicesSchedulerActivities
- extends TestRMWebServicesCapacitySched {
+public class TestRMWebServicesSchedulerActivities extends JerseyTestBase {
+
+ private MockRM rm;
- private static final Logger LOG = LoggerFactory.getLogger(
- TestRMWebServicesSchedulerActivities.class);
+ public TestRMWebServicesSchedulerActivities() {
+ super(createWebAppDescriptor());
+ }
+
+ @Before
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ rm = createMockRM(new CapacitySchedulerConfiguration(
+ new Configuration(false)));
+ GuiceServletConfig.setInjector(
+ Guice.createInjector(new TestRMWebServicesCapacitySched.WebServletModule(rm)));
+ }
@Test
public void testAssignMultipleContainersPerNodeHeartbeat()
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org