added correct variable datatype as per getters for setters

Change-Id: If5bac319b2b2fc3cb83f438dc0e19ca09dfcc257

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/capacity/CapacitySchedulerConfiguration.java

@@ -506,7 +506,7 @@ public void setMaximumApplicationMasterResourcePercent(float percent) {
   }
 
   public float getMaximumApplicationMasterResourcePercent() {
-    return getFloat(PREFIX + MAXIMUM_AM_RESOURCE_SUFFIX,
+    return getFloat(MAXIMUM_APPLICATION_MASTERS_RESOURCE_PERCENT,
         DEFAULT_MAXIMUM_APPLICATIONMASTERS_RESOURCE_PERCENT);
   }
 
@@ -1226,14 +1226,14 @@ public void reinitializeConfigurationProperties() {
     configurationProperties = new ConfigurationProperties(props);
   }
 
-  public void setQueueMaximumAllocationMb(String queue, String value) {
+  public void setQueueMaximumAllocationMb(String queue, int value) {
     String queuePrefix = getQueuePrefix(queue);
-    set(queuePrefix + MAXIMUM_ALLOCATION_MB, value);
+    setInt(queuePrefix + MAXIMUM_ALLOCATION_MB, value);
   }
 
-  public void setQueueMaximumAllocationVcores(String queue, String value) {
+  public void setQueueMaximumAllocationVcores(String queue, int value) {
     String queuePrefix = getQueuePrefix(queue);
-    set(queuePrefix + MAXIMUM_ALLOCATION_VCORES, value);
+    setInt(queuePrefix + MAXIMUM_ALLOCATION_VCORES, value);
   }
 
   public long getQueueMaximumAllocationMb(String queue) {
@@ -1846,17 +1846,17 @@ public static boolean shouldAppFailFast(Configuration conf) {
     return conf.getBoolean(APP_FAIL_FAST, DEFAULT_APP_FAIL_FAST);
   }
 
-  public void setDefaultMaxParallelAppsPerQueue(String value) {
-    set(PREFIX + MAX_PARALLEL_APPLICATIONS, value);
+  public void setDefaultMaxParallelApps(int value) {
+    setInt(PREFIX + MAX_PARALLEL_APPLICATIONS, value);
   }
 
-  public Integer getDefaultMaxParallelAppsPerQueue() {
+  public Integer getDefaultMaxParallelApps() {
     return getInt(PREFIX + MAX_PARALLEL_APPLICATIONS,
         DEFAULT_MAX_PARALLEL_APPLICATIONS);
   }
 
-  public void setDefaultMaxParallelAppsPerUser(String value) {
-    set(PREFIX + "user." + MAX_PARALLEL_APPLICATIONS, value);
+  public void setDefaultMaxParallelAppsPerUser(int value) {
+    setInt(PREFIX + "user." + MAX_PARALLEL_APPLICATIONS, value);
   }
 
   public Integer getDefaultMaxParallelAppsPerUser() {
@@ -1887,7 +1887,7 @@ public Integer getMaxParallelAppsForQueue(String queue) {
 
     return (maxParallelAppsForQueue != null) ?
         Integer.valueOf(maxParallelAppsForQueue)
-        : getDefaultMaxParallelAppsPerQueue();
+        : getDefaultMaxParallelApps();
   }
 
   public boolean getAllowZeroCapacitySum(String queue) {

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

@@ -374,15 +374,15 @@ private OutputStream getOutputStreamForJson() throws FileNotFoundException {
 
   private void emitDefaultQueueMaxParallelApplications() {
     if (queueMaxAppsDefault != Integer.MAX_VALUE) {
-      capacitySchedulerConfig.setDefaultMaxParallelAppsPerQueue(
-          String.valueOf(queueMaxAppsDefault));
+      capacitySchedulerConfig.setDefaultMaxParallelApps(
+          queueMaxAppsDefault);
     }
   }
 
   private void emitDefaultUserMaxParallelApplications() {
     if (userMaxAppsDefault != Integer.MAX_VALUE) {
       capacitySchedulerConfig.setDefaultMaxParallelAppsPerUser(
-          String.valueOf(userMaxAppsDefault));
+          userMaxAppsDefault);
     }
   }
 

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

@@ -16,10 +16,7 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter;
 
-import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.AUTO_QUEUE_CREATION_V2_ENABLED;
-import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.DEFAULT_AUTO_QUEUE_CREATION_ENABLED;
 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 java.util.List;
 import java.util.stream.Collectors;
@@ -179,7 +176,7 @@ private void emitMaxAllocations(String queueName, FSQueue queue) {
     Resource maxAllocation = queue.getMaximumContainerAllocation();
 
     if (isNotUnboundedResource(maxAllocation)) {
-      long parentMaxVcores = Integer.MIN_VALUE;
+      int parentMaxVcores = Integer.MIN_VALUE;
       long parentMaxMemory = Integer.MIN_VALUE;
 
       if (queue.getParent() != null) {
@@ -191,16 +188,16 @@ private void emitMaxAllocations(String queueName, FSQueue queue) {
         }
       }
 
-      long maxVcores = maxAllocation.getVirtualCores();
+      int maxVcores = maxAllocation.getVirtualCores();
       long maxMemory = maxAllocation.getMemorySize();
 
       // only emit max allocation if it differs from the parent's setting
       if (maxVcores != parentMaxVcores || maxMemory != parentMaxMemory) {
         capacitySchedulerConfig.setQueueMaximumAllocationMb(
-            queueName, String.valueOf(maxMemory));
+            queueName, (int) maxMemory);
 
         capacitySchedulerConfig.setQueueMaximumAllocationVcores(
-            queueName, String.valueOf(maxVcores));
+            queueName, maxVcores);
       }
     }
   }

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

@@ -282,7 +282,7 @@ public void testDefaultQueueMaxParallelApps() throws Exception {
     CapacitySchedulerConfiguration conf = converter.getCapacitySchedulerConfig();
 
     assertEquals("Default max parallel apps", 15,
-        conf.getDefaultMaxParallelAppsPerQueue(), 0);
+        conf.getDefaultMaxParallelApps(), 0);
   }
 
   @Test