Repository: ambari Updated Branches: refs/heads/trunk fedcbb8a5 -> c5b0e4833
AMBARI-6269. Capacity Scheduler config default in Ambari should not have unfunded queue config. (Jayush Luniya via mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c5b0e483 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c5b0e483 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c5b0e483 Branch: refs/heads/trunk Commit: c5b0e48333c28e6b433f8d5538677e433341bfda Parents: fedcbb8 Author: Mahadev Konar <[email protected]> Authored: Mon Jul 14 16:21:13 2014 -0700 Committer: Mahadev Konar <[email protected]> Committed: Mon Jul 14 16:21:13 2014 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/UpgradeHelper_HDP2.py | 3 +-- .../services/YARN/configuration/capacity-scheduler.xml | 7 ------- .../services/YARN/configuration/capacity-scheduler.xml | 7 ------- .../services/YARN/configuration/capacity-scheduler.xml | 9 +-------- .../python/stacks/2.0.6/configs/default.hbasedecom.json | 3 +-- .../src/test/python/stacks/2.0.6/configs/default.json | 3 +-- .../stacks/2.0.6/configs/default.non_gmetad_host.json | 3 +-- .../test/python/stacks/2.0.6/configs/flume_target.json | 3 +-- .../test/python/stacks/2.0.6/configs/ha_default.json | 3 +-- .../test/python/stacks/2.0.6/configs/ha_secured.json | 3 +-- .../src/test/python/stacks/2.0.6/configs/secured.json | 3 +-- .../stacks/2.0.6/configs/secured_no_jce_name.json | 3 +-- .../src/test/python/stacks/2.1/configs/default.json | 3 +-- .../src/test/python/stacks/2.1/configs/secured.json | 3 +-- ambari-server/src/test/resources/deploy_HDP2.sh | 4 ++-- .../services/YARN/configuration/capacity-scheduler.xml | 8 -------- .../services/YARN/configuration/capacity-scheduler.xml | 8 -------- .../assets/data/wizard/stack/hdp/version2.0.1/YARN.json | 12 ------------ ambari-web/app/utils/config.js | 2 +- 19 files changed, 15 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/main/python/UpgradeHelper_HDP2.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/UpgradeHelper_HDP2.py b/ambari-server/src/main/python/UpgradeHelper_HDP2.py index d0f03a0..78b0334 100644 --- a/ambari-server/src/main/python/UpgradeHelper_HDP2.py +++ b/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 = { http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml index 7769e75..261d872 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml @@ -110,13 +110,6 @@ </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> <description> http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/capacity-scheduler.xml index 7769e75..261d872 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/capacity-scheduler.xml @@ -110,13 +110,6 @@ </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> <description> http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/capacity-scheduler.xml index 7769e75..33b9aaf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/capacity-scheduler.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json index 9e11f5d..f633aa1 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.0.6/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index 7d268df..8cdfee5 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json index d6755e3..cae59f4 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json index d43eb4c..6dfb22a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json index 319d230..f6fc14e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json index 14c98a3..73ae92e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json index 6b28d54..3ffb213 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json index ca84090..070764d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.1/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json index 70da859..294f435 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/python/stacks/2.1/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json index e33c858..151f686 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/resources/deploy_HDP2.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/deploy_HDP2.sh b/ambari-server/src/test/resources/deploy_HDP2.sh index bff8e21..88f3a49 100644 --- a/ambari-server/src/test/resources/deploy_HDP2.sh +++ b/ambari-server/src/test/resources/deploy_HDP2.sh @@ -25,7 +25,7 @@ curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"core-site","tag echo "-----------------------core-site-----------------------" curl -i -X PUT -d '{"Clusters":{"desired_configs":{"type":"hdfs-site","tag":"version1","properties":{"dfs.name.dir":"","dfs.support.append":"true","dfs.webhdfs.enabled":"true","dfs.datanode.failed.volumes.tolerated":"0","dfs.block.local-path-access.user":"hbase","dfs.data.dir":"","dfs.hosts.exclude":"","dfs.checksum.type":"CRC32","dfs.replication.max":"50","dfs.replication":"3","dfs.heartbeat.interval":"3","dfs.heartbeat.interval":"3","dfs.safemode.threshold.pct":"1.0f","dfs.balance.bandwidthPerSec":"6250000","dfs.datanode.address":"0.0.0.0:50010","dfs.datanode.http.address":"0.0.0.0:50075","dfs.block.size":"134217728","dfs.http.address":"","dfs.datanode.du.reserved":"1073741824","dfs.datanode.ipc.address":"0.0.0.0:8010","dfs.blockreport.initialDelay":"120","dfs.namenode.handler.count":"40","dfs.datanode.max.xcievers":"1024","dfs.umaskmode":"022","dfs.web.ugi":"gopher,gopher","dfs.permissions":"true","dfs.permissions.supergroup":"hdfs","dfs.namenode.handler.count":"100","ipc.server. max.response.size":"5242880","dfs.block.access.token.enable":"true","dfs.namenode.kerberos.principal":"","dfs.secondary.namenode.kerberos.principal":"","dfs.namenode.kerberos.https.principal":"","dfs.secondary.namenode.kerberos.https.principal":"","dfs.secondary.http.address":"","dfs.secondary.https.port":"50490","dfs.web.authentication.kerberos.principal":"","dfs.web.authentication.kerberos.keytab":"","dfs.datanode.kerberos.principal":"","dfs.namenode.keytab.file":"","dfs.secondary.namenode.keytab.file":"","dfs.datanode.keytab.file":"","dfs.https.port":"50470","dfs.https.address":"","dfs.datanode.data.dir.perm":"750","dfs.access.time.precision":"0","dfs.cluster.administrators":"hdfs","ipc.server.read.threadpool.size":"5"}}}}' -u admin:admin http://localhost:8080/api/v1/clusters/c1 echo "-----------------------hdfs-site-----------------------" -curl -i -X PUT -d '{"Clusters":{"desired_configs":{"type":"capacity-scheduler","tag":"version1","properties":{"yarn.scheduler.capacity.maximum-applications":"10000","yarn.scheduler.capacity.maximum-am-resource-percent":"0.1","yarn.scheduler.capacity.root.queues":"default","yarn.scheduler.capacity.root.capacity":"100","yarn.scheduler.capacity.root.default.capacity":"100","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.root.default.acl_submit_jobs":"*","yarn.scheduler.capacity.root.default.acl_administer_jobs":"*","yarn.scheduler.capacity.root.acl_administer_queues":"*","yarn.scheduler.capacity.root.unfunded.capacity":"50"}}}}' -u admin:admin http://localhost:8080/api/v1/clusters/c1 +curl -i -X PUT -d '{"Clusters":{"desired_configs":{"type":"capacity-scheduler","tag":"version1","properties":{"yarn.scheduler.capacity.maximum-applications":"10000","yarn.scheduler.capacity.maximum-am-resource-percent":"0.1","yarn.scheduler.capacity.root.queues":"default","yarn.scheduler.capacity.root.capacity":"100","yarn.scheduler.capacity.root.default.capacity":"100","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.root.default.acl_submit_jobs":"*","yarn.scheduler.capacity.root.default.acl_administer_jobs":"*","yarn.scheduler.capacity.root.acl_administer_queues":"*"}}}}' -u admin:admin http://localhost:8080/api/v1/clusters/c1 echo "-----------------------capacity-scheduler-----------------------" curl -i -X PUT -d '{"Clusters":{"desired_configs":{"type":"mapred-queue-acls","tag":"version1","properties":{"mapred.queue.default.acl-submit-job":"*","mapred.queue.default.acl-administer-jobs":"*"}}}}' -u admin:admin http://localhost:8080/api/v1/clusters/c1 echo "-----------------------mapred-queue-acls-----------------------" @@ -39,7 +39,7 @@ curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"webhcat-site"," echo "-----------------------webhcat-site-----------------------" curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"oozie-site","tag":"version1","properties":{"oozie.service.AuthorizationService.security.enabled":"true","oozie.service.PurgeService.purge.interval":"3600","oozie.service.PurgeService.older.than":"30","oozie.system.id":"oozie-${user.name}","oozie.service.coord.normal.default.timeout":"120","oozie.service.JPAService.pool.max.active.conn":"10","oozie.authentication.type":"simple","use.system.libpath.for.mapreduce.and.pig.jobs":"false","oozie.service.CallableQueueService.callable.concurrency":"3","oozie.service.CallableQueueService.threads":"10","oozie.base.url":"http://HOST:11000/oozie","oozie.service.CallableQueueService.queue.size":"1000","oozie.service.JPAService.jdbc.username":"oozie","oozie.authentication.kerberos.name.rules":"\n RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/\n RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/\n RULE:[2:$1@$0](hm@.*TODO-KERBEROS-D OMAIN)s/.*/TODO-HBASE-USER/\n RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/\n DEFAULT\n ","oozie.service.SchemaService.wf.ext.schemas":"shell-action-0.1.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,sqoop-action-0.2.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd,hive-action-0.3.xsd","oozie.service.HadoopAccessorService.nameNode.whitelist":" ","oozie.service.WorkflowAppService.system.libpath":"/user/${user.name}/share/lib","oozie.systemmode":"NORMAL","oozie.service.JPAService.create.db.schema":"false","oozie.service.JPAService.jdbc.password":"admin","oozie.service.HadoopAccessorService.jobTracker.whitelist":" ","oozie.db.schema.name":"oozie","oozie.service.JPAService.jdbc.url":"jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create\u003dtrue","oozie.service.JPAService.jdbc.driver":"org.apache.derby.jdbc.EmbeddedDriver","oozie.service.HadoopAccessorService.hadoop.configurations":"*\u003d/etc/hadoop/conf","oozie.service.ActionService.executor. ext.classes":"\n org.apache.oozie.action.email.EmailActionExecutor,\n org.apache.oozie.action.hadoop.HiveActionExecutor,\n org.apache.oozie.action.hadoop.ShellActionExecutor,\n org.apache.oozie.action.hadoop.SqoopActionExecutor,\n org.apache.oozie.action.hadoop.DistcpActionExecutor\n "}}}}'| sed s/HOST/$HOST/g` -u admin:admin http://localhost:8080/api/v1/clusters/c1 echo "-----------------------oozie-site-----------------------" -curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"capacity-scheduler","tag":"version1", "properties":{"yarn.scheduler.capacity.maximum-applications":"10000","yarn.scheduler.capacity.maximum-am-resource-percent":"0.1", "yarn.scheduler.capacity.root.queues":"default","yarn.scheduler.capacity.root.capacity":"100", "yarn.scheduler.capacity.root.default.capacity":"100","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.root.default.acl_submit_jobs":"*", "yarn.scheduler.capacity.root.default.acl_administer_jobs":"*", "yarn.scheduler.capacity.root.acl_administer_queues":"*","yarn.scheduler.capacity.root.unfunded.capacity":"50"}}}}'| sed s/HOST/$HOST/g` -u admin:admin http://localhost:8080/api/v1/clusters/c1 +curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"capacity-scheduler","tag":"version1", "properties":{"yarn.scheduler.capacity.maximum-applications":"10000","yarn.scheduler.capacity.maximum-am-resource-percent":"0.1", "yarn.scheduler.capacity.root.queues":"default","yarn.scheduler.capacity.root.capacity":"100", "yarn.scheduler.capacity.root.default.capacity":"100","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.root.default.acl_submit_jobs":"*", "yarn.scheduler.capacity.root.default.acl_administer_jobs":"*", "yarn.scheduler.capacity.root.acl_administer_queues":"*"}}}}'| sed s/HOST/$HOST/g` -u admin:admin http://localhost:8080/api/v1/clusters/c1 echo "-----------------------capacity-sscheduler-----------------------" curl -i -X POST -d '[{"ServiceInfo":{"service_name":"HIVE"}},{"ServiceInfo":{"service_name":"HCATALOG"}},{"ServiceInfo":{"service_name":"WEBHCAT"}}]' -u admin:admin http://localhost:8080/api/v1/clusters/c1/services http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/capacity-scheduler.xml index 3f78292..cc64305 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/capacity-scheduler.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml index ccfb779..fd9101d 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/YARN.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/YARN.json b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/YARN.json index 1ba51b9..acba00b 100644 --- a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/YARN.json +++ b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/YARN.json @@ -578,18 +578,6 @@ } }, { - "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" : { "property_description" : "\n The maximum allocation for every container request at the RM,\n in MBs. Memory requests higher than this won't take effect,\n and will get capped to this value.\n ", http://git-wip-us.apache.org/repos/asf/ambari/blob/c5b0e483/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 7db38c1..3372770 100644 --- a/ambari-web/app/utils/config.js +++ b/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) {
