YARN-11041. Unit test fixes

Change-Id: I95540b77da3983f82943000b32f8d1ede791761f
apache · Mar 3, 2023 · f789293 · f789293
1 parent b0d36f0
commit f789293
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.../java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueuePrefixes.java b/.../java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueuePrefixes.java
@@ -42,8 +42,8 @@ public static String getNodeLabelPrefix(QueuePath queuePath, String label) {
   }
 
   /**
-   * Get the auto created leaf queue's template configuration prefix
-   * Leaf queue's template capacities are configured at the parent queue
+   * Get the auto created leaf queue's template configuration prefix.
+   * Leaf queue's template capacities are configured at the parent queue.
    *
    * @param queuePath parent queue's path
    * @return Config prefix for leaf queue template configurations

diff --git a/...cemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/...cemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
@@ -526,8 +526,8 @@ public void testFlexibleAutoCreatedQueuesWithSpecializedACLTemplatesAndDynamicPa
         "1w");
     csConf.set(ROOT_PARENT_PATH + "*." + AUTO_QUEUE_LEAF_TEMPLATE_PREFIX + "acl_administer_queue",
         "user3");
-    csConf.set(ROOT_PARENT_PATH + "*." + AUTO_QUEUE_LEAF_TEMPLATE_PREFIX + "acl_submit_applications",
-        "user3");
+    csConf.set(ROOT_PARENT_PATH + "*." + AUTO_QUEUE_LEAF_TEMPLATE_PREFIX
+        + "acl_submit_applications", "user3");
 
     MockRM newMockRM = new MockRM(csConf);
 
@@ -617,8 +617,8 @@ public void testFlexibleAutoCreatedQueuesWithMixedCommonLeafACLTemplatesAndDynam
         "1w");
     csConf.set(ROOT_PARENT_PATH + "*." + AUTO_QUEUE_LEAF_TEMPLATE_PREFIX + "acl_administer_queue",
         "user3");
-    csConf.set(ROOT_PARENT_PATH + "*." + AUTO_QUEUE_LEAF_TEMPLATE_PREFIX + "acl_submit_applications",
-        "user3");
+    csConf.set(ROOT_PARENT_PATH + "*." + AUTO_QUEUE_LEAF_TEMPLATE_PREFIX
+        + "acl_submit_applications", "user3");
 
     testFlexibleAQCDWithMixedTemplatesDynamicParentACLScenario(conf, csConf);
   }

diff --git a/.../test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java b/.../test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java
@@ -594,7 +594,7 @@ private void setupQueueConfiguration(CapacitySchedulerConfiguration conf) {
   private void setupQueueConfigurationOnlyA(
       CapacitySchedulerConfiguration conf) {
     conf.setQueues(ROOT, new String[] {R});
-    conf.setCapacity(R_QUEUE_PATH, 10);
+    conf.setCapacity(R_QUEUE_PATH, 100);
     conf.setQueues(R_QUEUE_PATH, new String[] {A});
     conf.setCapacity(A_QUEUE_PATH, 100);
     conf.setDouble(CapacitySchedulerConfiguration

diff --git a/.../java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java b/.../java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
@@ -479,7 +479,7 @@ public void testPolicyConfiguration() throws Exception {
       "testPolicyRoot" + System.currentTimeMillis();
 
     OrderingPolicy<FiCaSchedulerApp> comPol =    
-      testConf.<FiCaSchedulerApp>getAppOrderingPolicy(new QueuePath(tproot));
+        testConf.<FiCaSchedulerApp>getAppOrderingPolicy(new QueuePath(tproot));
 
 
   }

diff --git a/...pache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/...pache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java
@@ -161,20 +161,20 @@ private static void setupQueueConfiguration(
     config.setMaximumCapacity(leafQueueAPath, 50);
 
     String leafQueueB = CapacitySchedulerConfiguration.ROOT + "." + QUEUE_B;
-    QueuePath leafQueueBPath = new QueuePath(leafQueueA);
+    QueuePath leafQueueBPath = new QueuePath(leafQueueB);
     config.setCapacity(leafQueueBPath, 30);
     config.setMaximumCapacity(leafQueueBPath, 50);
 
     config.setCapacity(interMediateQueueCPath, 40);
     config.setMaximumCapacity(interMediateQueueCPath, 50);
 
     String leafQueueC1 = interMediateQueueC + "." + LEAF_QUEUE_C1;
-    QueuePath leafQueueC1Path = new QueuePath(leafQueueA);
+    QueuePath leafQueueC1Path = new QueuePath(leafQueueC1);
     config.setCapacity(leafQueueC1Path, 50);
     config.setMaximumCapacity(leafQueueC1Path, 60);
 
     String leafQueueC2 = interMediateQueueC + "." + LEAF_QUEUE_C2;
-    QueuePath leafQueueC2Path = new QueuePath(leafQueueA);
+    QueuePath leafQueueC2Path = new QueuePath(leafQueueC2);
     config.setCapacity(leafQueueC2Path, 50);
     config.setMaximumCapacity(leafQueueC2Path, 70);