Repository: ambari Updated Branches: refs/heads/trunk e22b67103 -> 5da97da85
AMBARI-10298. YARN service configs should look just like mockups - adding checkbox configs (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5da97da8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5da97da8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5da97da8 Branch: refs/heads/trunk Commit: 5da97da85bd9868621f574c4907a96d218a2418b Parents: e22b671 Author: Srimanth Gunturi <[email protected]> Authored: Wed Apr 1 12:34:50 2015 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Wed Apr 1 13:24:12 2015 -0700 ---------------------------------------------------------------------- .../YARN/2.1.0.2.0/configuration/yarn-site.xml | 4 +++ .../services/YARN/configuration/yarn-site.xml | 15 ++++++++++ .../HDP/2.2/services/YARN/themes/theme.json | 30 ++++++++++++++++++++ 3 files changed, 49 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5da97da8/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml index e71dfc9..ee7a0b9 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml @@ -259,6 +259,10 @@ <name>yarn.log-aggregation-enable</name> <value>true</value> <description>Whether to enable log aggregation. </description> + <display-name>Enable Log Aggregation</display-name> + <value-attributes> + <type>boolean</type> + </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/5da97da8/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml index 9137bdb..afa673e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml @@ -77,6 +77,10 @@ <description> Enable RM work preserving recovery. This configuration is private to YARN for experimenting the feature. </description> + <dispaly-name>Enable Work Preserving Restart</dispaly-name> + <value-attributes> + <type>boolean</type> + </value-attributes> </property> <property> <name>yarn.resourcemanager.store.class</name> @@ -372,4 +376,15 @@ </property> </depends-on> </property> + <property> + <name>yarn.node-labels.enabled</name> + <value>false</value> + <description> + Enabled node labels to restrict YARN applications so that they run only on cluster nodes that have a specified node label. + </description> + <dispaly-name>Enable Node Labels</dispaly-name> + <value-attributes> + <type>boolean</type> + </value-attributes> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/5da97da8/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json index 1bcd696..a671549 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/themes/theme.json @@ -124,6 +124,18 @@ { "config": "yarn-site/yarn.scheduler.maximum-allocation-vcores", "subsection-name": "subsection-container-sizing-col2" + }, + { + "config": "yarn-site/yarn.node-labels.enabled", + "subsection-name": "subsection-yarn-platform-features-col1" + }, + { + "config": "yarn-site/yarn.resourcemanager.work-preserving-recovery.enabled", + "subsection-name": "subsection-yarn-platform-features-col1" + }, + { + "config": "yarn-site/yarn.log-aggregation-enable", + "subsection-name": "subsection-yarn-platform-features-col1" } ] }, @@ -215,6 +227,24 @@ } ] } + }, + { + "config":"yarn-site/yarn.node-labels.enabled", + "widget":{ + "type":"checkbox" + } + }, + { + "config":"yarn-site/yarn.log-aggregation-enable", + "widget":{ + "type":"checkbox" + } + }, + { + "config":"yarn-site/yarn.resourcemanager.work-preserving-recovery.enabled", + "widget":{ + "type":"checkbox" + } } ] }
