YARN-11511 Improve TestRMWebServices test config and data

fix by review

Author: K0K0V0K

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java

@@ -133,8 +133,8 @@ private Configuration createConfig() {
     conf.set("yarn.scheduler.capacity.root.a.capacity", "20");
     conf.set("yarn.scheduler.capacity.root.a.maximum-capacity", "50");
     conf.set("yarn.scheduler.capacity.root.a.max-parallel-app", "42");
-    conf.set("yarn.scheduler.capacity.root.b.capacity", "79.5");
-    conf.set("yarn.scheduler.capacity.root.c.capacity", "0.5");
+    conf.set("yarn.scheduler.capacity.root.b.capacity", "70");
+    conf.set("yarn.scheduler.capacity.root.c.capacity", "10");
     return conf;
   }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java

@@ -122,12 +122,14 @@ public void testWeightModeFlexibleAQC() throws Exception {
     setupAQC(config, "yarn.scheduler.capacity.root.test1.");
     setupAQC(config, "yarn.scheduler.capacity.root.test1.test1_1.");
     try (MockRM rm = createMutableRM(config)) {
+      rm.registerNode("h1:1234", 32768, 32);
+      assertJsonResponse(sendRequest(resource()),
+          String.format(EXPECTED_FILE_TMPL, "testWeightMode", "before-aqc"));
       createAQC(rm, "test1");
       createAQC(rm, "test1.test1_1");
-      rm.registerNode("h1:1234", 32768, 32);
       reinitialize(rm, config);
       assertJsonResponse(sendRequest(resource()),
-          String.format(EXPECTED_FILE_TMPL, "testWeightMode", "aqc"));
+          String.format(EXPECTED_FILE_TMPL, "testWeightMode", "after-aqc"));
     }
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java

@@ -27,7 +27,6 @@
 import org.junit.After;
 import org.junit.Test;
 
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
@@ -36,76 +35,22 @@
 import org.apache.hadoop.yarn.webapp.JerseyTestBase;
 
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfigGeneratorForTest.createConfiguration;
+import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerTestUtilities.GB;
 import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.assertJsonResponse;
 import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.createMutableRM;
 import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.createWebAppDescriptor;
 
 public class TestRMWebServicesCapacitySchedLegacyQueueCreation extends
     JerseyTestBase {
-  private MockRM rm;
-
   private CapacitySchedulerQueueManager autoQueueHandler;
 
   public TestRMWebServicesCapacitySchedLegacyQueueCreation() {
     super(createWebAppDescriptor());
   }
 
-  @After
-  public void shutDown(){
-    if (rm != null) {
-      rm.stop();
-      rm = null;
-    }
-  }
-
   @Test
   public void testSchedulerResponsePercentageModeLegacyAutoCreation()
       throws Exception {
-    Configuration config = createPercentageConfigLegacyAutoCreation();
-
-    rm = createMutableRM(config);
-    /*
-     * mode: percentage
-     * managedtest2.autoCreationEligibility: legacy, others.autoCreationEligibility: off
-     * weight: -1, normalizedWeight: 0
-     * root.queueType: parent, others.queueType: leaf
-     */
-    assertJsonResponse(sendRequest(),
-        "webapp/scheduler-response-PercentageModeLegacyAutoCreation.json");
-  }
-
-  @Test
-  public void testSchedulerResponseAbsoluteModeLegacyAutoCreation()
-      throws Exception {
-    Configuration config = createAbsoluteConfigLegacyAutoCreation();
-
-    rm = createMutableRM(config);
-
-    initAutoQueueHandler(8192);
-    createQueue("root.managed.queue1");
-
-    assertJsonResponse(sendRequest(),
-        "webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json");
-  }
-
-  private void initAutoQueueHandler(int nodeMemory) throws Exception {
-    CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler();
-    autoQueueHandler = cs.getCapacitySchedulerQueueManager();
-    rm.registerNode("h1:1234", nodeMemory, 32); // label = x
-  }
-
-  private void createQueue(String queuePath) throws YarnException,
-      IOException {
-    autoQueueHandler.createQueue(new QueuePath(queuePath));
-  }
-
-  private ClientResponse sendRequest() {
-    return resource().path("ws").path("v1").path("cluster")
-        .path("scheduler").accept(MediaType.APPLICATION_JSON)
-        .get(ClientResponse.class);
-  }
-
-  private Configuration createPercentageConfigLegacyAutoCreation() {
     Map<String, String> conf = new HashMap<>();
     conf.put("yarn.scheduler.capacity.root.queues", "default, test1, " +
         "managedtest2");
@@ -116,10 +61,15 @@ private Configuration createPercentageConfigLegacyAutoCreation() {
     conf.put("yarn.scheduler.capacity.root.managedtest2.state", "RUNNING");
     conf.put("yarn.scheduler.capacity.root.managedtest2." +
         "auto-create-child-queue.enabled", "true");
-    return createConfiguration(conf);
+    try(MockRM rm = createMutableRM(createConfiguration(conf))) {
+      assertJsonResponse(sendRequest(),
+          "webapp/scheduler-response-PercentageModeLegacyAutoCreation.json");
+    }
   }
 
-  private Configuration createAbsoluteConfigLegacyAutoCreation() {
+  @Test
+  public void testSchedulerResponseAbsoluteModeLegacyAutoCreation()
+      throws Exception {
     Map<String, String> conf = new HashMap<>();
     conf.put("yarn.scheduler.capacity.root.queues", "default, managed");
     conf.put("yarn.scheduler.capacity.root.default.state", "STOPPED");
@@ -134,6 +84,29 @@ private Configuration createAbsoluteConfigLegacyAutoCreation() {
         "user");
     conf.put("yarn.scheduler.capacity.root.managed.leaf-queue-template.acl_administer_queue",
         "admin");
-    return createConfiguration(conf);
+    try (MockRM rm = createMutableRM(createConfiguration(conf))) {
+      initAutoQueueHandler(rm);
+      createQueue("root.managed.queue1");
+      assertJsonResponse(sendRequest(),
+          "webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json");
+    }
+  }
+
+  private void initAutoQueueHandler(MockRM rm) throws Exception {
+    CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler();
+    autoQueueHandler = cs.getCapacitySchedulerQueueManager();
+    rm.registerNode("h1:1234", 32 * GB, 32); // label = x
   }
+
+  private void createQueue(String queuePath) throws YarnException,
+      IOException {
+    autoQueueHandler.createQueue(new QueuePath(queuePath));
+  }
+
+  private ClientResponse sendRequest() {
+    return resource().path("ws").path("v1").path("cluster")
+        .path("scheduler").accept(MediaType.APPLICATION_JSON)
+        .get(ClientResponse.class);
+  }
+
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java

@@ -1748,4 +1748,35 @@ private void sendHeartbeat(RESTClient restClient, MockNM[] nms)
       return restClient.isDone();
     }, 10, 20000);
   }
+
+  private CapacitySchedulerConfiguration createConfig(CapacitySchedulerConfiguration config) {
+    config.set("yarn.scheduler.capacity.root.queues", "a, b, c");
+    config.set("yarn.scheduler.capacity.root.a.queues", "a1, a2");
+    config.set("yarn.scheduler.capacity.root.b.queues", "b1, b2, b3");
+    config.set("yarn.scheduler.capacity.root.a.a1.queues", "a1a, a1b, a1c");
+    config.set("yarn.scheduler.capacity.root.a.capacity", "10.5");
+    config.set("yarn.scheduler.capacity.root.a.maximum-capacity", "50");
+    config.set("yarn.scheduler.capacity.root.a.max-parallel-app", "42");
+    config.set("yarn.scheduler.capacity.root.b.capacity", "79.5");
+    config.set("yarn.scheduler.capacity.root.c.capacity", "10");
+    config.set("yarn.scheduler.capacity.root.a.a1.capacity", "30");
+    config.set("yarn.scheduler.capacity.root.a.a1.maximum-capacity", "50");
+    config.set("yarn.scheduler.capacity.root.a.a1.user-limit-factor", "100");
+    config.set("yarn.scheduler.capacity.root.a.a2.capacity", "70");
+    config.set("yarn.scheduler.capacity.root.a.a2.maximum-application-lifetime", "100");
+    config.set("yarn.scheduler.capacity.root.a.a2.default-application-lifetime", "50");
+    config.set("yarn.scheduler.capacity.root.a.a2.user-limit-factor", "100");
+    config.set("yarn.scheduler.capacity.root.b.b1.capacity", "60");
+    config.set("yarn.scheduler.capacity.root.b.b2.capacity", "39.5");
+    config.set("yarn.scheduler.capacity.root.b.b3.capacity", "0.5");
+    config.set("yarn.scheduler.capacity.root.b.b1.user-limit-factor", "100");
+    config.set("yarn.scheduler.capacity.root.b.b2.user-limit-factor", "100");
+    config.set("yarn.scheduler.capacity.root.b.b3.user-limit-factor", "100");
+    config.set("yarn.scheduler.capacity.root.a.a1.a1a.capacity", "65");
+    config.set("yarn.scheduler.capacity.root.a.a1.a1b.capacity", "15");
+    config.set("yarn.scheduler.capacity.root.a.a1.a1c.capacity", "20");
+    config.set("yarn.scheduler.capacity.root.a.a1.a1c.auto-create-child-queue.enabled", "true");
+    config.set("yarn.scheduler.capacity.root.a.a1.a1c.leaf-queue-template.capacity", "50");
+    return config;
+  }
 }