moved method emitDefaultUserLimitFactor to FSqueueConverter

Change-Id: Ife4762de43fd21924d2b481502580e74a8242d83

Author: susheel-gupta

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverter.java

@@ -16,12 +16,10 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter;
 
-import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.DOT;
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.PREFIX;
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAPPING_RULE_FORMAT;
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAPPING_RULE_JSON;
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAPPING_RULE_FORMAT_JSON;
-import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.USER_LIMIT_FACTOR;
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSQueueConverter.QUEUE_MAX_AM_SHARE_DISABLED;
 
 import java.io.ByteArrayOutputStream;
@@ -315,7 +313,7 @@ private void convertCapacitySchedulerXml(FairScheduler fs) {
         .withPercentages(usePercentages)
         .build();
 
-    emitDefaultUserLimitFactor(fsLeafQueue);
+    queueConverter.emitDefaultUserLimitFactor(fsLeafQueue, capacitySchedulerConfig);
     queueConverter.convertQueueHierarchy(rootQueue);
     emitACLs(fs);
   }
@@ -419,19 +417,6 @@ private void emitDefaultMaxAMShare() {
     }
   }
 
-  private void emitDefaultUserLimitFactor(Collection<FSLeafQueue> fsLeafQueue) {
-    fsLeafQueue
-        .forEach((leafQueue) -> {
-          if (!capacitySchedulerConfig.
-                isAutoQueueCreationV2Enabled(leafQueue.getName())) {
-            capacitySchedulerConfig.setFloat(
-                    CapacitySchedulerConfiguration.
-                            PREFIX + leafQueue.getName() + DOT + USER_LIMIT_FACTOR,
-                    -1.0f);
-          }
-        });
-  }
-
   private void emitDisablePreemptionForObserveOnlyMode() {
     if (preemptionMode == FSConfigToCSConfigConverterParams
             .PreemptionMode.OBSERVE_ONLY) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSQueueConverter.java

@@ -17,12 +17,16 @@
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter;
 
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.PREFIX;
+import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.DOT;
+import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.USER_LIMIT_FACTOR;
 
 import java.util.List;
+import java.util.Collection;
 import java.util.stream.Collectors;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.ConfigurableResource;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
@@ -215,6 +219,19 @@ private void emitPreemptionDisabled(String queueName, FSQueue queue) {
     }
   }
 
+  public void emitDefaultUserLimitFactor(Collection<FSLeafQueue> fsLeafQueue, CapacitySchedulerConfiguration config) {
+    fsLeafQueue
+          .forEach((leafQueue) -> {
+            if (!config.
+                    isAutoQueueCreationV2Enabled(leafQueue.getName())) {
+              config.setFloat(
+                      CapacitySchedulerConfiguration.
+                              PREFIX + leafQueue.getName() + DOT + USER_LIMIT_FACTOR,
+                      -1.0f);
+            }
+          });
+  }
+
   /**
    * yarn.scheduler.fair.sizebasedweight ==>
    * yarn.scheduler.capacity.&lt;queue-path&gt;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java

@@ -191,10 +191,12 @@ public void testDefaultUserLimitFactor() throws Exception {
     converter.convert(config);
 
     Configuration conf = converter.getCapacitySchedulerConfig();
-    String userLimitFactor =
-            conf.get(PREFIX + "root.default." + USER_LIMIT_FACTOR);
 
-    assertEquals("Default user limit factor", "-1.0", userLimitFactor);
+    assertNull("root.users user-limit-factor should be null",
+            conf.get(PREFIX + "root.users." + USER_LIMIT_FACTOR));
+
+    assertEquals("root.default user-limit-factor", "-1.0",
+            conf.get(PREFIX + "root.default.user-limit-factor"));
 
     assertEquals("root.users.joe user-limit-factor", "-1.0",
             conf.get(PREFIX + "root.users.joe.user-limit-factor"));