fix of method call emitDefaultUserLimitFactor

Change-Id: I79bdb749c2ce2db1b37cdc4813f6b8527d057fb0

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

@@ -29,7 +29,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -49,7 +48,6 @@
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.AllocationConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.AllocationConfigurationException;
 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.FSParentQueue;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
@@ -293,7 +291,6 @@ private void convertYarnSiteXml(Configuration inputYarnSiteConfig) {
 
   private void convertCapacitySchedulerXml(FairScheduler fs) {
     FSParentQueue rootQueue = fs.getQueueManager().getRootQueue();
-    Collection<FSLeafQueue> fsLeafQueue = fs.getQueueManager().getLeafQueues();
     emitDefaultQueueMaxParallelApplications();
     emitDefaultUserMaxParallelApplications();
     emitUserMaxParallelApplications();
@@ -313,7 +310,6 @@ private void convertCapacitySchedulerXml(FairScheduler fs) {
         .withPercentages(usePercentages)
         .build();
 
-    queueConverter.emitDefaultUserLimitFactor(fsLeafQueue, capacitySchedulerConfig);
     queueConverter.convertQueueHierarchy(rootQueue);
     emitACLs(fs);
   }
@@ -416,7 +412,6 @@ private void emitDefaultMaxAMShare() {
           queueMaxAMShareDefault);
     }
   }
-
   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

@@ -21,7 +21,6 @@
 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;
@@ -83,6 +82,7 @@ public void convertQueueHierarchy(FSQueue queue) {
     emitMaxParallelApps(queueName, queue);
     emitMaxAllocations(queueName, queue);
     emitPreemptionDisabled(queueName, queue);
+    emitDefaultUserLimitFactor(queueName, children);
 
     emitChildCapacity(queue);
     emitMaximumCapacity(queueName, queue);
@@ -219,17 +219,13 @@ 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);
-            }
-          });
+  public void emitDefaultUserLimitFactor(String queueName, List<FSQueue> children) {
+    if (children.isEmpty()) {
+      capacitySchedulerConfig.setFloat(
+              CapacitySchedulerConfiguration.
+                      PREFIX + queueName + DOT + USER_LIMIT_FACTOR,
+              -1.0f);
+    }
   }
 
   /**