AMBARI-6269. Capacity Scheduler config default in Ambari should not have unfunded queue config. (Jayush Luniya via mahadev)

ambari-server/src/main/python/UpgradeHelper_HDP2.py

@@ -334,8 +334,7 @@ CAPACITY_SCHEDULER = {
   "yarn.scheduler.capacity.root.default.maximum-capacity": "100",
   "yarn.scheduler.capacity.root.default.state": "RUNNING",
   "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
-  "yarn.scheduler.capacity.root.queues": "default",
-  "yarn.scheduler.capacity.root.unfunded.capacity": "50"
+  "yarn.scheduler.capacity.root.queues": "default"
 }
 
 MAPRED_SITE = {

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml

@@ -109,13 +109,6 @@
     </description>
   </property>
   
-  <property>
-    <name>yarn.scheduler.capacity.root.unfunded.capacity</name>
-    <value>50</value>
-    <description>
-      No description
-    </description>
-  </property>
   <property>
     <name>yarn.scheduler.capacity.node-locality-delay</name>
     <value>40</value>

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/capacity-scheduler.xml

@@ -109,13 +109,6 @@
     </description>
   </property>
   
-  <property>
-    <name>yarn.scheduler.capacity.root.unfunded.capacity</name>
-    <value>50</value>
-    <description>
-      No description
-    </description>
-  </property>
   <property>
     <name>yarn.scheduler.capacity.node-locality-delay</name>
     <value>40</value>

ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/capacity-scheduler.xml

@@ -108,14 +108,7 @@
       allocations.
     </description>
   </property>
-  
-  <property>
-    <name>yarn.scheduler.capacity.root.unfunded.capacity</name>
-    <value>50</value>
-    <description>
-      No description
-    </description>
-  </property>
+
   <property>
     <name>yarn.scheduler.capacity.node-locality-delay</name>
     <value>40</value>

ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json

@@ -298,8 +298,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.0.6/configs/default.json

@@ -303,8 +303,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json

@@ -299,8 +299,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json

@@ -300,8 +300,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json

@@ -125,8 +125,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json

@@ -188,8 +188,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.0.6/configs/secured.json

@@ -396,8 +396,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json

@@ -393,8 +393,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.1/configs/default.json

@@ -340,8 +340,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/python/stacks/2.1/configs/secured.json

@@ -444,8 +444,7 @@
             "yarn.scheduler.capacity.root.acl_administer_queue": "*",
             "yarn.scheduler.capacity.root.queues": "default", 
             "yarn.scheduler.capacity.maximum-applications": "10000", 
-            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
-            "yarn.scheduler.capacity.root.unfunded.capacity": "50", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1",
             "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
             "yarn.scheduler.capacity.root.default.state": "RUNNING", 
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 

ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/capacity-scheduler.xml

@@ -108,13 +108,5 @@
       allocations.
     </description>
   </property>
-  
-  <property>
-    <name>yarn.scheduler.capacity.root.unfunded.capacity</name>
-    <value>50</value>
-    <description>
-      No description
-    </description>
-  </property>
 
 </configuration>

ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml

@@ -108,13 +108,5 @@
       allocations.
     </description>
   </property>
-  
-  <property>
-    <name>yarn.scheduler.capacity.root.unfunded.capacity</name>
-    <value>50</value>
-    <description>
-      No description
-    </description>
-  </property>
 
 </configuration>

ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/YARN.json

@@ -577,18 +577,6 @@
         "type" : "capacity-scheduler.xml"
       }
     },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/YARN/configurations/yarn.scheduler.capacity.root.unfunded.capacity",
-      "StackConfigurations" : {
-        "property_description" : "\n      No description\n    ",
-        "property_name" : "yarn.scheduler.capacity.root.unfunded.capacity",
-        "property_value" : "50",
-        "service_name" : "YARN",
-        "stack_name" : "HDP",
-        "stack_version" : "2.0.1",
-        "type" : "capacity-scheduler.xml"
-      }
-    },
     {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/YARN/configurations/yarn.scheduler.maximum-allocation-mb",
       "StackConfigurations" : {

ambari-web/app/utils/config.js

@@ -268,7 +268,7 @@ App.config = Em.Object.create({
   },
 
   capacitySchedulerFilter: function () {
-    var yarnRegex = /^yarn\.scheduler\.capacity\.root\.(?!unfunded)([a-z]([\_\-a-z0-9]{0,50}))\.(acl_administer_jobs|acl_submit_jobs|state|user-limit-factor|maximum-capacity|capacity)$/i;
+    var yarnRegex = /^yarn\.scheduler\.capacity\.root\.([a-z]([\_\-a-z0-9]{0,50}))\.(acl_administer_jobs|acl_submit_jobs|state|user-limit-factor|maximum-capacity|capacity)$/i;
     var self = this;
     if (App.get('isHadoop2Stack')) {
       return function (_config) {