Browse Source

AMBARI-4663. Queue ACLs configuration names are wrong (Arsen Babych via
aonishuk)

Andrew Onischuk 11 years ago
parent
commit
f60a78f681

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

@@ -85,7 +85,7 @@
   </property>
 
   <property>
-    <name>yarn.scheduler.capacity.root.default.acl_submit_jobs</name>
+    <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
     <value>*</value>
     <description>
       The ACL of who can submit jobs to the default queue.
@@ -101,7 +101,7 @@
   </property>
 
   <property>
-    <name>yarn.scheduler.capacity.root.acl_administer_queues</name>
+    <name>yarn.scheduler.capacity.root.acl_administer_queue</name>
     <value>*</value>
     <description>
       The ACL for who can administer this queue i.e. change sub-queue 

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

@@ -85,7 +85,7 @@
   </property>
 
   <property>
-    <name>yarn.scheduler.capacity.root.default.acl_submit_jobs</name>
+    <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
     <value>*</value>
     <description>
       The ACL of who can submit jobs to the default queue.
@@ -101,7 +101,7 @@
   </property>
 
   <property>
-    <name>yarn.scheduler.capacity.root.acl_administer_queues</name>
+    <name>yarn.scheduler.capacity.root.acl_administer_queue</name>
     <value>*</value>
     <description>
       The ACL for who can administer this queue i.e. change sub-queue 

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

@@ -298,7 +298,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "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", 
@@ -308,7 +308,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.checkpoint.period": "21600", 

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

@@ -298,7 +298,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "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", 
@@ -308,7 +308,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.checkpoint.period": "21600", 

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

@@ -395,7 +395,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "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", 
@@ -405,7 +405,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.avoid.write.stale.datanode": "true", 

+ 2 - 2
ambari-server/src/test/python/stacks/2.1.1/configs/default.json

@@ -297,7 +297,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "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", 
@@ -307,7 +307,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.checkpoint.period": "21600", 

+ 2 - 2
ambari-server/src/test/python/stacks/2.1.1/configs/secured.json

@@ -394,7 +394,7 @@
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
-            "yarn.scheduler.capacity.root.acl_administer_queues": "*", 
+            "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", 
@@ -404,7 +404,7 @@
             "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
             "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
             "yarn.scheduler.capacity.root.default.capacity": "100", 
-            "yarn.scheduler.capacity.root.default.acl_submit_jobs": "*"
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*"
         }, 
         "hdfs-site": {
             "dfs.namenode.avoid.write.stale.datanode": "true",