You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2016/12/09 21:57:14 UTC
[22/51] [abbrv] ambari git commit: AMBARI-19137. HDP 3.0 TP - move ZK, HDFS,
YARN/MR into new common-services version (alejandro)
http://git-wip-us.apache.org/repos/asf/ambari/blob/d845449a/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/themes-mapred/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/themes-mapred/theme.json b/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/themes-mapred/theme.json
deleted file mode 100644
index 5019447..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/themes-mapred/theme.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
- "name": "default",
- "description": "Default theme for MAPREDUCE service",
- "configuration": {
- "layouts": [
- {
- "name": "default",
- "tabs": [
- {
- "name": "settings",
- "display-name": "Settings",
- "layout": {
- "tab-columns": "1",
- "tab-rows": "1",
- "sections": [
- {
- "name": "section-mr-scheduler",
- "display-name": "MapReduce",
- "row-index": "0",
- "column-index": "0",
- "row-span": "1",
- "column-span": "1",
- "section-columns": "3",
- "section-rows": "1",
- "subsections": [
- {
- "name": "subsection-mr-scheduler-row1-col1",
- "display-name": "MapReduce Framework",
- "row-index": "0",
- "column-index": "0",
- "row-span": "1",
- "column-span": "1"
- },
- {
- "name": "subsection-mr-scheduler-row1-col2",
- "row-index": "0",
- "column-index": "1",
- "row-span": "1",
- "column-span": "1"
- },
- {
- "name": "subsection-mr-scheduler-row1-col3",
- "row-index": "0",
- "column-index": "2",
- "row-span": "1",
- "column-span": "1"
- },
- {
- "name": "subsection-mr-scheduler-row2-col1",
- "display-name": "MapReduce AppMaster",
- "row-index": "1",
- "column-index": "0",
- "row-span": "1",
- "column-span": "3"
- }
- ]
- }
- ]
- }
- }
- ]
- }
- ],
- "placement": {
- "configuration-layout": "default",
- "configs": [
- {
- "config": "mapred-site/mapreduce.map.memory.mb",
- "subsection-name": "subsection-mr-scheduler-row1-col1"
- },
- {
- "config": "mapred-site/mapreduce.reduce.memory.mb",
- "subsection-name": "subsection-mr-scheduler-row1-col2"
- },
- {
- "config": "mapred-site/yarn.app.mapreduce.am.resource.mb",
- "subsection-name": "subsection-mr-scheduler-row2-col1"
- },
- {
- "config": "mapred-site/mapreduce.task.io.sort.mb",
- "subsection-name": "subsection-mr-scheduler-row1-col3"
- }
- ]
- },
- "widgets": [
- {
- "config": "mapred-site/mapreduce.map.memory.mb",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "GB"
- }
- ]
- }
- },
- {
- "config": "mapred-site/mapreduce.reduce.memory.mb",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "GB"
- }
- ]
- }
- },
- {
- "config": "mapred-site/yarn.app.mapreduce.am.resource.mb",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "GB"
- }
- ]
- }
- },
- {
- "config": "mapred-site/mapreduce.task.io.sort.mb",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "MB"
- }
- ]
- }
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d845449a/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/themes/theme.json
deleted file mode 100644
index 758cf0c..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/themes/theme.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "name": "default",
- "description": "Default theme for YARN service",
- "configuration": {
- "layouts": [
- {
- "name": "default",
- "tabs": [
- {
- "name": "settings",
- "display-name": "Settings",
- "layout": {
- "tab-columns": "3",
- "tab-rows": "2",
- "sections": [
- {
- "name": "section-nm-sizing",
- "display-name": "Memory",
- "row-index": "0",
- "column-index": "0",
- "row-span": "1",
- "column-span": "2",
- "section-columns": "2",
- "section-rows": "1",
- "subsections": [
- {
- "name": "subsection-nm-sizing-col1",
- "display-name": "Node",
- "row-index": "0",
- "column-index": "0",
- "row-span": "1",
- "column-span": "1"
- },
- {
- "name": "subsection-nm-sizing-col2",
- "display-name": "Container",
- "row-index": "0",
- "column-index": "1",
- "row-span": "1",
- "column-span": "1"
- }
- ]
- },
- {
- "name": "section-yarn-platform-features",
- "display-name": "YARN Features",
- "row-index": "0",
- "column-index": "2",
- "row-span": "1",
- "column-span": "1",
- "section-columns": "1",
- "section-rows": "1",
- "subsections": [
- {
- "name": "subsection-yarn-platform-features-col1",
- "row-index": "0",
- "column-index": "0",
- "row-span": "1",
- "column-span": "1"
- }
- ]
- },
- {
- "name": "section-container-sizing",
- "display-name": "CPU",
- "row-index": "1",
- "column-index": "0",
- "row-span": "1",
- "column-span": "2",
- "section-columns": "2",
- "section-rows": "1",
- "subsections": [
- {
- "name": "subsection-container-sizing-col1",
- "display-name": "Node",
- "row-index": "0",
- "column-index": "0",
- "row-span": "1",
- "column-span": "1"
- },
- {
- "name": "subsection-container-sizing-col2",
- "display-name": "Container",
- "row-index": "0",
- "column-index": "1",
- "row-span": "1",
- "column-span": "1"
- }
- ]
- }
- ]
- }
- }
- ]
- }
- ],
- "placement": {
- "configuration-layout": "default",
- "configs": [
- {
- "config": "yarn-site/yarn.nodemanager.resource.memory-mb",
- "subsection-name": "subsection-nm-sizing-col1"
- },
- {
- "config": "yarn-site/yarn.scheduler.minimum-allocation-mb",
- "subsection-name": "subsection-nm-sizing-col2"
- },
- {
- "config": "yarn-site/yarn.scheduler.maximum-allocation-mb",
- "subsection-name": "subsection-nm-sizing-col2"
- },
- {
- "config": "yarn-site/yarn.node-labels.enabled",
- "subsection-name": "subsection-yarn-platform-features-col1"
- },
- {
- "config": "yarn-site/yarn.resourcemanager.scheduler.monitor.enable",
- "subsection-name": "subsection-yarn-platform-features-col1"
- },
- {
- "config": "capacity-scheduler/yarn.scheduler.capacity.resource-calculator",
- "subsection-name": "subsection-container-sizing-col1"
- },
- {
- "config": "yarn-env/yarn_cgroups_enabled",
- "subsection-name": "subsection-container-sizing-col1"
- },
- {
- "config": "yarn-site/yarn.nodemanager.resource.percentage-physical-cpu-limit",
- "subsection-name": "subsection-container-sizing-col1"
- },
- {
- "config": "yarn-site/yarn.nodemanager.resource.cpu-vcores",
- "subsection-name": "subsection-container-sizing-col1"
- },
- {
- "config": "yarn-site/yarn.scheduler.minimum-allocation-vcores",
- "subsection-name": "subsection-container-sizing-col2"
- },
- {
- "config": "yarn-site/yarn.scheduler.maximum-allocation-vcores",
- "subsection-name": "subsection-container-sizing-col2"
- }
- ]
- },
- "widgets": [
- {
- "config": "yarn-site/yarn.nodemanager.resource.memory-mb",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "MB"
- }
- ]
- }
- },
- {
- "config": "yarn-site/yarn.nodemanager.resource.percentage-physical-cpu-limit",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "percent"
- }
- ]
- }
- },
- {
- "config": "yarn-site/yarn.nodemanager.resource.cpu-vcores",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "int"
- }
- ]
- }
- },
- {
- "config": "yarn-site/yarn.scheduler.minimum-allocation-mb",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "MB"
- }
- ]
- }
- },
- {
- "config": "yarn-site/yarn.scheduler.maximum-allocation-mb",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "MB"
- }
- ]
- }
- },
- {
- "config": "yarn-site/yarn.scheduler.minimum-allocation-vcores",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "int"
- }
- ]
- }
- },
- {
- "config": "yarn-site/yarn.scheduler.maximum-allocation-vcores",
- "widget": {
- "type": "slider",
- "units": [
- {
- "unit-name": "int"
- }
- ]
- }
- },
- {
- "config": "yarn-site/yarn.node-labels.enabled",
- "widget": {
- "type": "toggle"
- }
- },
- {
- "config": "yarn-env/yarn_cgroups_enabled",
- "widget": {
- "type": "toggle"
- }
- },
- {
- "config": "yarn-site/yarn.resourcemanager.scheduler.monitor.enable",
- "widget": {
- "type": "toggle"
- }
- },
- {
- "config": "capacity-scheduler/yarn.scheduler.capacity.resource-calculator",
- "widget": {
- "type": "toggle"
- }
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d845449a/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZOOKEEPER/metainfo.xml
index 5d4fb4d..50cb18d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZOOKEEPER/metainfo.xml
@@ -20,10 +20,8 @@
<services>
<service>
<name>ZOOKEEPER</name>
- <displayName>ZooKeeper</displayName>
- <comment>Centralized service which provides highly reliable distributed coordination</comment>
- <version>3.4.6.3.0</version>
- <extends>common-services/ZOOKEEPER/3.4.6</extends>
+ <version>3.4.9.3.0</version>
+ <extends>common-services/ZOOKEEPER/3.4.9</extends>
<osSpecifics>
<osSpecific>