AMBARI-7948 - Add new configs to HDPWIN 2.1 stack and new configuration flags(Eugene Chekanskiy via abaranchuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/95a13e03 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/95a13e03 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/95a13e03 Branch: refs/heads/branch-windows-dev Commit: 95a13e03307e7ee4d20fd3bc9ed3343070891b8b Parents: 892ebe4 Author: Artem Baranchuk <[email protected]> Authored: Fri Oct 24 18:04:32 2014 +0300 Committer: Artem Baranchuk <[email protected]> Committed: Fri Oct 24 18:06:43 2014 +0300 ---------------------------------------------------------------------- .../services/HBASE/configuration/hbase-env.xml | 34 ++++++++++++++++++++ .../HBASE/configuration/hbase-policy.xml | 2 +- .../services/HDFS/configuration/core-site.xml | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 6 ++++ .../HDFS/configuration/hadoop-policy.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 2 +- .../services/OOZIE/configuration/oozie-site.xml | 2 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 28 +++++++++++++++- 9 files changed, 73 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml new file mode 100644 index 0000000..81ddd04 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> + +<configuration> + <property> + <name>hbase_regionserver_xmn_max</name> + <value>512</value> + <description>HBase RegionServer maximum value for minimum heap size.</description> + </property> + <property> + <name>hbase_regionserver_xmn_ratio</name> + <value>0.2</value> + <description>HBase RegionServer minimum heap size is calculated as a percentage of max heap size.</description> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-policy.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-policy.xml index a49fb97..b0807b6 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-policy.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-policy.xml @@ -20,7 +20,7 @@ */ --> -<configuration> +<configuration supports_final="true"> <property> <name>security.client.protocol.acl</name> <value>*</value> http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml index 29b78cc..2dbda14 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- Put site-specific property overrides in this file. --> -<configuration xmlns:xi="http://www.w3.org/2001/XInclude";> +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> <!-- i/o properties --> <property> <name>io.file.buffer.size</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml index 416c46b..2380408 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml @@ -78,4 +78,10 @@ <value>hadoop</value> </property> + <property> + <name>dfs.datanode.data.dir.mount.file</name> + <value>c:\hadoop\hdfs\dfs_data_dir_mount.hist</value> + <description>File path that contains the last known mount point for each data dir. This file is used to avoid creating a DFS data dir on the root drive (and filling it up) if a path was previously mounted on a drive.</description> + </property> + </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-policy.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-policy.xml index cc83bc5..1549b41 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-policy.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-policy.xml @@ -24,7 +24,7 @@ <!-- Put site-specific property overrides in this file. --> -<configuration> +<configuration supports_final="true"> <property> <name>security.client.protocol.acl</name> <value>*</value> http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml index 20231a9..f267e51 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- Put site-specific property overrides in this file. --> -<configuration> +<configuration supports_final="true"> <!-- file system properties --> <property> <name>dfs.namenode.name.dir</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml index 8df99c4..2051d01 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<configuration> +<configuration supports_final="true"> <!-- Refer to the oozie-default.xml file for the complete list of http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/capacity-scheduler.xml index cbe9f4f..c2be95b 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/capacity-scheduler.xml @@ -11,7 +11,7 @@ See the License for the specific language governing permissions and limitations under the License. See accompanying LICENSE file. --> -<configuration> +<configuration supports_final="false" supports_adding_forbidden="true"> <property> <name>yarn.scheduler.capacity.maximum-applications</name> <value>10000</value> http://git-wip-us.apache.org/repos/asf/ambari/blob/95a13e03/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml index 6b82601..7aecf01 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml @@ -1,7 +1,33 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- Put site-specific property overrides in this file. --> -<configuration xmlns:xi="http://www.w3.org/2001/XInclude";> +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> + <property> + <name>yarn.nodemanager.resource.memory-mb</name> + <value>5120</value> + <description>Amount of physical memory, in MB, that can be allocated + for containers.</description> + </property> + + <property> + <name>yarn.scheduler.minimum-allocation-mb</name> + <value>512</value> + <description> + The minimum allocation for every container request at the RM, + in MBs. Memory requests lower than this won't take effect, + and the specified value will get allocated at minimum. + </description> + </property> + + <property> + <name>yarn.scheduler.maximum-allocation-mb</name> + <value>2048</value> + <description> + The maximum allocation for every container request at the RM, + in MBs. Memory requests higher than this won't take effect, + and will get capped to this value. + </description> + </property> <property> <name>yarn.nodemanager.pmem-check-enabled</name> <value>true</value>
