You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/06/02 15:02:46 UTC
[16/47] ambari git commit: AMBARI-16272. Ambari Upgrade shouldn't
automatically add stack configs (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/hdfs-site.xml b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/hdfs-site.xml
index 995f6c1..fc70b1b 100644
--- a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/hdfs-site.xml
@@ -1,6 +1,5 @@
<?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
@@ -17,13 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
<configuration>
-
-<!-- file system properties -->
-
+ <!-- file system properties -->
<property>
<name>dfs.name.dir</name>
<!-- cluster variant -->
@@ -33,29 +28,33 @@
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.support.append</name>
<value>true</value>
<description>to enable dfs append</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.webhdfs.enabled</name>
<value>false</value>
<description>to enable webhdfs</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.failed.volumes.tolerated</name>
<value>0</value>
<description>#of failed disks dn would tolerate</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.block.local-path-access.user</name>
<value>hbase</value>
@@ -63,8 +62,9 @@
circuit reads.
</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.data.dir</name>
<value>/mnt/hmc/hadoop/hdfs/data</value>
@@ -75,8 +75,9 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.hosts.exclude</name>
<value>/etc/hadoop/conf/dfs.exclude</value>
@@ -84,8 +85,9 @@
not permitted to connect to the namenode. The full pathname of the
file must be specified. If the value is empty, no hosts are
excluded.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.hosts</name>
<value>/etc/hadoop/conf/dfs.include</value>
@@ -93,28 +95,32 @@
permitted to connect to the namenode. The full pathname of the file
must be specified. If the value is empty, all hosts are
permitted.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.replication</name>
<value>3</value>
<description>Default block replication.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.safemode.threshold.pct</name>
<value>1.0f</value>
@@ -124,8 +130,9 @@
Values less than or equal to 0 mean not to start in safe mode.
Values greater than 1 will make safe mode permanent.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.balance.bandwidthPerSec</name>
<value>6250000</value>
@@ -134,170 +141,190 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.address</name>
<value>0.0.0.0:50010</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.http.address</name>
<value>0.0.0.0:50075</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.block.size</name>
<value>134217728</value>
<description>The default block size for new files.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.http.address</name>
<value>hdp1.cybervisiontech.com.ua:50070</value>
-<description>The name of the default file system. Either the
+ <description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
-<final>true</final>
-</property>
-
-<property>
-<name>dfs.datanode.du.reserved</name>
-<!-- cluster variant -->
-<value>1073741824</value>
-<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
+ <final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.du.reserved</name>
+ <!-- cluster variant -->
+ <value>1073741824</value>
+ <description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
</description>
-</property>
-
-<property>
-<name>dfs.datanode.ipc.address</name>
-<value>0.0.0.0:8010</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.ipc.address</name>
+ <value>0.0.0.0:8010</value>
+ <description>
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
-</property>
-
-<property>
-<name>dfs.blockreport.initialDelay</name>
-<value>120</value>
-<description>Delay for first block report in seconds.</description>
-</property>
-
-<property>
-<name>dfs.namenode.handler.count</name>
-<value>40</value>
-<description>The number of server threads for the namenode.</description>
-</property>
-
-<property>
-<name>dfs.datanode.max.xcievers</name>
-<value>1024</value>
-<description>PRIVATE CONFIG VARIABLE</description>
-</property>
-
-<!-- Permissions configuration -->
-
-<property>
-<name>dfs.umaskmode</name>
-<value>077</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.blockreport.initialDelay</name>
+ <value>120</value>
+ <description>Delay for first block report in seconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.handler.count</name>
+ <value>40</value>
+ <description>The number of server threads for the namenode.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.max.xcievers</name>
+ <value>1024</value>
+ <description>PRIVATE CONFIG VARIABLE</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <!-- Permissions configuration -->
+ <property>
+ <name>dfs.umaskmode</name>
+ <value>077</value>
+ <description>
The octal umask used when creating files and directories.
</description>
-</property>
-
-<property>
-<name>dfs.web.ugi</name>
-<!-- cluster variant -->
-<value>gopher,gopher</value>
-<description>The user account used by the web interface.
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.web.ugi</name>
+ <!-- cluster variant -->
+ <value>gopher,gopher</value>
+ <description>The user account used by the web interface.
Syntax: USERNAME,GROUP1,GROUP2, ...
</description>
-</property>
-
-<property>
-<name>dfs.permissions</name>
-<value>true</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.permissions</name>
+ <value>true</value>
+ <description>
If "true", enable permission checking in HDFS.
If "false", permission checking is turned off,
but all other behavior is unchanged.
Switching from one parameter value to the other does not change the mode,
owner or group of files or directories.
</description>
-</property>
-
-<property>
-<name>dfs.permissions.supergroup</name>
-<value>hdfs</value>
-<description>The name of the group of super-users.</description>
-</property>
-
-<property>
-<name>dfs.namenode.handler.count</name>
-<value>100</value>
-<description>Added to grow Queue size so that more client connections are allowed</description>
-</property>
-
-<property>
-<name>ipc.server.max.response.size</name>
-<value>5242880</value>
-</property>
-<property>
-<name>dfs.block.access.token.enable</name>
-<value>true</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.permissions.supergroup</name>
+ <value>hdfs</value>
+ <description>The name of the group of super-users.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.handler.count</name>
+ <value>100</value>
+ <description>Added to grow Queue size so that more client connections are allowed</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ipc.server.max.response.size</name>
+ <value>5242880</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.block.access.token.enable</name>
+ <value>true</value>
+ <description>
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
-</property>
-
-<property>
-<name>dfs.namenode.kerberos.principal</name>
-<value>nn/_HOST@</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.kerberos.principal</name>
+ <value>nn/_HOST@</value>
+ <description>
Kerberos principal name for the NameNode
</description>
-</property>
-
-<property>
-<name>dfs.secondary.namenode.kerberos.principal</name>
-<value>nn/_HOST@</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.secondary.namenode.kerberos.principal</name>
+ <value>nn/_HOST@</value>
<description>
Kerberos principal name for the secondary NameNode.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
-
-<!--
+ <!--
This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
-->
<property>
<name>dfs.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
- <description>The Kerberos principal for the host that the NameNode runs on.</description>
-
+ <description>The Kerberos principal for the host that the NameNode runs on.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
<description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description>
-
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<!-- cluster variant -->
<name>dfs.secondary.http.address</name>
<value>hdp2.cybervisiontech.com.ua:50090</value>
<description>Address of secondary namenode web server</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.https.port</name>
<value>50490</value>
<description>The https port where secondary-namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.web.authentication.kerberos.principal</name>
<value>HTTP/_HOST@</value>
@@ -306,8 +333,9 @@ Kerberos principal name for the NameNode
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
<value>/nn.service.keytab</value>
@@ -315,82 +343,91 @@ Kerberos principal name for the NameNode
The Kerberos keytab file with the credentials for the
HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.kerberos.principal</name>
<value>dn/_HOST@</value>
- <description>
+ <description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.keytab.file</name>
<value>/nn.service.keytab</value>
- <description>
+ <description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.namenode.keytab.file</name>
<value>/nn.service.keytab</value>
- <description>
+ <description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.keytab.file</name>
<value>/dn.service.keytab</value>
- <description>
+ <description>
The filename of the keytab file for the DataNode.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.https.port</name>
<value>50470</value>
- <description>The https port where namenode binds</description>
-
+ <description>The https port where namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.https.address</name>
<value>hdp1.cybervisiontech.com.ua:50470</value>
- <description>The https address where namenode binds</description>
-
+ <description>The https address where namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.data.dir.perm</name>
<value>750</value>
-<description>The permissions that should be there on dfs.data.dir
+ <description>The permissions that should be there on dfs.data.dir
directories. The datanode will not come up if the permissions are
different on existing dfs.data.dir directories. If the directories
don't exist, they will be created with this permission.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
- <name>dfs.access.time.precision</name>
- <value>0</value>
- <description>The access time for HDFS file is precise up to this value.
+ <name>dfs.access.time.precision</name>
+ <value>0</value>
+ <description>The access time for HDFS file is precise up to this value.
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
-</property>
-
-<property>
- <name>dfs.cluster.administrators</name>
- <value> hdfs</value>
- <description>ACL for who all can view the default servlets in the HDFS</description>
-</property>
-
-<property>
- <name>ipc.server.read.threadpool.size</name>
- <value>5</value>
- <description></description>
-</property>
-
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.cluster.administrators</name>
+ <value> hdfs</value>
+ <description>ACL for who all can view the default servlets in the HDFS</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ipc.server.read.threadpool.size</name>
+ <value>5</value>
+ <description/>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/mapred-site.xml
index db3a0ac..ea3d6b6 100644
--- a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/MAPREDUCE/configuration/mapred-site.xml
@@ -1,6 +1,5 @@
<?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
@@ -17,13 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
<configuration>
-
-<!-- file system properties -->
-
+ <!-- file system properties -->
<property>
<name>dfs.name.dir</name>
<!-- cluster variant -->
@@ -33,29 +28,33 @@
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.support.append</name>
<value>true</value>
<description>to enable dfs append</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.webhdfs.enabled</name>
<value>false</value>
<description>to enable webhdfs</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.failed.volumes.tolerated</name>
<value>0</value>
<description>#of failed disks dn would tolerate</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.block.local-path-access.user</name>
<value>hbase</value>
@@ -63,8 +62,9 @@
circuit reads.
</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.data.dir</name>
<value>/mnt/hmc/hadoop/hdfs/data</value>
@@ -75,8 +75,9 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.hosts.exclude</name>
<value>/etc/hadoop/conf/dfs.exclude</value>
@@ -84,8 +85,9 @@
not permitted to connect to the namenode. The full pathname of the
file must be specified. If the value is empty, no hosts are
excluded.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.hosts</name>
<value>/etc/hadoop/conf/dfs.include</value>
@@ -93,28 +95,32 @@
permitted to connect to the namenode. The full pathname of the file
must be specified. If the value is empty, all hosts are
permitted.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.replication</name>
<value>3</value>
<description>Default block replication.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.safemode.threshold.pct</name>
<value>1.0f</value>
@@ -124,8 +130,9 @@
Values less than or equal to 0 mean not to start in safe mode.
Values greater than 1 will make safe mode permanent.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.balance.bandwidthPerSec</name>
<value>6250000</value>
@@ -134,174 +141,193 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.address</name>
<value>0.0.0.0:50010</value>
<description>Address where the datanode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.http.address</name>
<value>0.0.0.0:50075</value>
<description>HTTP address for the datanode</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.block.size</name>
<value>134217728</value>
<description>The default block size for new files.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.http.address</name>
<value>hdp1.cybervisiontech.com.ua:50070</value>
-<description>The name of the default file system. Either the
+ <description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
-<final>true</final>
-</property>
-
-<property>
-<name>dfs.datanode.du.reserved</name>
-<!-- cluster variant -->
-<value>1073741824</value>
-<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
+ <final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.du.reserved</name>
+ <!-- cluster variant -->
+ <value>1073741824</value>
+ <description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
</description>
-</property>
-
-<property>
-<name>dfs.datanode.ipc.address</name>
-<value>0.0.0.0:8010</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.ipc.address</name>
+ <value>0.0.0.0:8010</value>
+ <description>
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
-</property>
-
-<property>
-<name>dfs.blockreport.initialDelay</name>
-<value>120</value>
-<description>Delay for first block report in seconds.</description>
-</property>
-
-<property>
-<name>dfs.namenode.handler.count</name>
-<value>40</value>
-<description>The number of server threads for the namenode.</description>
-</property>
-
-<property>
-<name>dfs.datanode.max.xcievers</name>
-<value>1024</value>
-<description>PRIVATE CONFIG VARIABLE</description>
-</property>
-
-<!-- Permissions configuration -->
-
-<property>
-<name>dfs.umaskmode</name>
-<value>077</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.blockreport.initialDelay</name>
+ <value>120</value>
+ <description>Delay for first block report in seconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.handler.count</name>
+ <value>40</value>
+ <description>The number of server threads for the namenode.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.max.xcievers</name>
+ <value>1024</value>
+ <description>PRIVATE CONFIG VARIABLE</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <!-- Permissions configuration -->
+ <property>
+ <name>dfs.umaskmode</name>
+ <value>077</value>
+ <description>
The octal umask used when creating files and directories.
</description>
-</property>
-
-<property>
-<name>dfs.web.ugi</name>
-<!-- cluster variant -->
-<value>gopher,gopher</value>
-<description>The user account used by the web interface.
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.web.ugi</name>
+ <!-- cluster variant -->
+ <value>gopher,gopher</value>
+ <description>The user account used by the web interface.
Syntax: USERNAME,GROUP1,GROUP2, ...
</description>
-</property>
-
-<property>
-<name>dfs.permissions</name>
-<value>true</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.permissions</name>
+ <value>true</value>
+ <description>
If "true", enable permission checking in HDFS.
If "false", permission checking is turned off,
but all other behavior is unchanged.
Switching from one parameter value to the other does not change the mode,
owner or group of files or directories.
</description>
-</property>
-
-<property>
-<name>dfs.permissions.supergroup</name>
-<value>hdfs</value>
-<description>The name of the group of super-users.</description>
-</property>
-
-<property>
-<name>dfs.namenode.handler.count</name>
-<value>100</value>
-<description>Added to grow Queue size so that more client connections are allowed</description>
-</property>
-
-<property>
-<name>ipc.server.max.response.size</name>
-<value>5242880</value>
-<description>The max response size for IPC</description>
-</property>
-
-<property>
-<name>dfs.block.access.token.enable</name>
-<value>true</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.permissions.supergroup</name>
+ <value>hdfs</value>
+ <description>The name of the group of super-users.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.handler.count</name>
+ <value>100</value>
+ <description>Added to grow Queue size so that more client connections are allowed</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ipc.server.max.response.size</name>
+ <value>5242880</value>
+ <description>The max response size for IPC</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.block.access.token.enable</name>
+ <value>true</value>
+ <description>
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
-</property>
-
-<property>
-<name>dfs.namenode.kerberos.principal</name>
-<value>nn/_HOST@</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.kerberos.principal</name>
+ <value>nn/_HOST@</value>
+ <description>
Kerberos principal name for the NameNode
</description>
-</property>
-
-<property>
-<name>dfs.secondary.namenode.kerberos.principal</name>
-<value>nn/_HOST@</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.secondary.namenode.kerberos.principal</name>
+ <value>nn/_HOST@</value>
<description>
Kerberos principal name for the secondary NameNode.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
-
-<!--
+ <!--
This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
-->
<property>
<name>dfs.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
- <description>The Kerberos principal for the host that the NameNode runs on.</description>
-
+ <description>The Kerberos principal for the host that the NameNode runs on.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
<description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description>
-
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<!-- cluster variant -->
<name>dfs.secondary.http.address</name>
<value>hdp2.cybervisiontech.com.ua:50090</value>
<description>Address of secondary namenode web server</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.https.port</name>
<value>50490</value>
<description>The https port where secondary-namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.web.authentication.kerberos.principal</name>
<value>HTTP/_HOST@</value>
@@ -310,8 +336,9 @@ Kerberos principal name for the NameNode
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
<value>/nn.service.keytab</value>
@@ -319,82 +346,91 @@ Kerberos principal name for the NameNode
The Kerberos keytab file with the credentials for the
HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.kerberos.principal</name>
<value>dn/_HOST@</value>
- <description>
+ <description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.keytab.file</name>
<value>/nn.service.keytab</value>
- <description>
+ <description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.namenode.keytab.file</name>
<value>/nn.service.keytab</value>
- <description>
+ <description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.keytab.file</name>
<value>/dn.service.keytab</value>
- <description>
+ <description>
The filename of the keytab file for the DataNode.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.https.port</name>
<value>50470</value>
- <description>The https port where namenode binds</description>
-
+ <description>The https port where namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.https.address</name>
<value>hdp1.cybervisiontech.com.ua:50470</value>
- <description>The https address where namenode binds</description>
-
+ <description>The https address where namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.data.dir.perm</name>
<value>750</value>
-<description>The permissions that should be there on dfs.data.dir
+ <description>The permissions that should be there on dfs.data.dir
directories. The datanode will not come up if the permissions are
different on existing dfs.data.dir directories. If the directories
don't exist, they will be created with this permission.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
- <name>dfs.access.time.precision</name>
- <value>0</value>
- <description>The access time for HDFS file is precise up to this value.
+ <name>dfs.access.time.precision</name>
+ <value>0</value>
+ <description>The access time for HDFS file is precise up to this value.
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
-</property>
-
-<property>
- <name>dfs.cluster.administrators</name>
- <value> hdfs</value>
- <description>ACL for who all can view the default servlets in the HDFS</description>
-</property>
-
-<property>
- <name>ipc.server.read.threadpool.size</name>
- <value>5</value>
- <description>IPC thread size</description>
-</property>
-
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.cluster.administrators</name>
+ <value> hdfs</value>
+ <description>ACL for who all can view the default servlets in the HDFS</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ipc.server.read.threadpool.size</name>
+ <value>5</value>
+ <description>IPC thread size</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/capacity-scheduler.xml
index 49a9a42..d56e78d 100644
--- a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/capacity-scheduler.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,29 +15,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="false" supports_deletable="false">
-
<property require-input="false">
<name>yarn.scheduler.capacity.maximum-applications</name>
<value>10000</value>
<description>Maximum number of applications that can be pending and running.</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>yarn.scheduler.capacity.maximum-am-resource-percent</name>
<value>0.2</value>
<deleted>true</deleted>
<description>Maximum percent of resources in the cluster.</description>
<final>false</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property require-input="true">
<name>yarn.scheduler.capacity.root.queues</name>
<value>default</value>
<deleted>false</deleted>
<description>The queues at the this level (root is the root queue).</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/yarn-site.xml
index 6b1d8d9..1b6b118 100644
--- a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/services/YARN/configuration/yarn-site.xml
@@ -16,26 +16,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="asd" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<!-- ResourceManager -->
-
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude" supports_final="asd">
+ <!-- ResourceManager -->
<property>
<name>yarn.resourcemanager.resource-tracker.address</name>
<value>localhost:8025</value>
<deleted>true</deleted>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>yarn.resourcemanager.scheduler.address</name>
<value>localhost:8030</value>
<description>The address of the scheduler interface.</description>
<deleted>true</deleted>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>yarn.resourcemanager.address</name>
<value>localhost:100009</value>
@@ -43,18 +41,21 @@
The address of the applications manager interface in the
RM.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>yarn.resourcemanager.admin.address</name>
- <value></value>
+ <value/>
<description>The address of the RM admin interface.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>new-yarn-property</name>
<value>some-value</value>
<description>some description.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/test/resources/common-services/HBASE/1.0/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/common-services/HBASE/1.0/configuration/hbase-site.xml b/ambari-server/src/test/resources/common-services/HBASE/1.0/configuration/hbase-site.xml
index 5024e85..38eb42e 100644
--- a/ambari-server/src/test/resources/common-services/HBASE/1.0/configuration/hbase-site.xml
+++ b/ambari-server/src/test/resources/common-services/HBASE/1.0/configuration/hbase-site.xml
@@ -29,12 +29,16 @@
in milliseconds. Default is 15. Set this value low if you want unit
tests to be responsive.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.client.pause</name>
<value>5000</value>
<description>General client pause value. Used mostly as value to wait
before running a retry of a failed get, region lookup, etc.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.meta.thread.rescanfrequency</name>
@@ -42,6 +46,8 @@
<description>How long the HMaster sleeps (in milliseconds) between scans of
the root and meta tables.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.server.thread.wakefrequency</name>
@@ -49,6 +55,8 @@
<description>Time to sleep in between searches for work (in milliseconds).
Used as sleep interval by service threads such as META scanner and log roller.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.handler.count</name>
@@ -57,6 +65,8 @@
Same property is used by the HMaster for count of master handlers.
Default is 10.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.lease.period</name>
@@ -66,6 +76,8 @@
value has been reduced so that the master will notice a dead region server
sooner. The default is 30 seconds.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.info.port</name>
@@ -73,6 +85,8 @@
<description>The port for the hbase master web UI
Set to -1 if you do not want the info server to run.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
@@ -80,6 +94,8 @@
<description>The port for the hbase regionserver web UI
Set to -1 if you do not want the info server to run.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.info.port.auto</name>
@@ -88,6 +104,8 @@
search if hbase.regionserver.info.port is already in use.
Enabled for testing to run multiple tests on one machine.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.lease.thread.wakefrequency</name>
@@ -96,6 +114,8 @@
This value has been reduced due to the other reduced values above so that
the master will notice a dead region server sooner. The default is 15 seconds.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.optionalcacheflushinterval</name>
@@ -104,6 +124,8 @@
Amount of time to wait since the last time a region was flushed before
invoking an optional cache flush. Default 60,000.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.safemode</name>
@@ -112,6 +134,8 @@
Turn on/off safe mode in region server. Always on for production, always off
for tests.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -122,10 +146,14 @@
Keep the maximum filesize small so we split more often in tests.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hadoop.log.dir</name>
<value>${user.dir}/../logs</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -133,5 +161,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hbase-site.xml b/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hbase-site.xml
index 5024e85..38eb42e 100644
--- a/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hbase-site.xml
+++ b/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hbase-site.xml
@@ -29,12 +29,16 @@
in milliseconds. Default is 15. Set this value low if you want unit
tests to be responsive.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.client.pause</name>
<value>5000</value>
<description>General client pause value. Used mostly as value to wait
before running a retry of a failed get, region lookup, etc.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.meta.thread.rescanfrequency</name>
@@ -42,6 +46,8 @@
<description>How long the HMaster sleeps (in milliseconds) between scans of
the root and meta tables.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.server.thread.wakefrequency</name>
@@ -49,6 +55,8 @@
<description>Time to sleep in between searches for work (in milliseconds).
Used as sleep interval by service threads such as META scanner and log roller.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.handler.count</name>
@@ -57,6 +65,8 @@
Same property is used by the HMaster for count of master handlers.
Default is 10.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.lease.period</name>
@@ -66,6 +76,8 @@
value has been reduced so that the master will notice a dead region server
sooner. The default is 30 seconds.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.info.port</name>
@@ -73,6 +85,8 @@
<description>The port for the hbase master web UI
Set to -1 if you do not want the info server to run.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
@@ -80,6 +94,8 @@
<description>The port for the hbase regionserver web UI
Set to -1 if you do not want the info server to run.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.info.port.auto</name>
@@ -88,6 +104,8 @@
search if hbase.regionserver.info.port is already in use.
Enabled for testing to run multiple tests on one machine.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.lease.thread.wakefrequency</name>
@@ -96,6 +114,8 @@
This value has been reduced due to the other reduced values above so that
the master will notice a dead region server sooner. The default is 15 seconds.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.optionalcacheflushinterval</name>
@@ -104,6 +124,8 @@
Amount of time to wait since the last time a region was flushed before
invoking an optional cache flush. Default 60,000.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.safemode</name>
@@ -112,6 +134,8 @@
Turn on/off safe mode in region server. Always on for production, always off
for tests.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -122,10 +146,14 @@
Keep the maximum filesize small so we split more often in tests.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hadoop.log.dir</name>
<value>${user.dir}/../logs</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -133,5 +161,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hdfs-site.xml b/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hdfs-site.xml
index 995f6c1..fc70b1b 100644
--- a/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/common-services/HDFS/1.0/configuration/hdfs-site.xml
@@ -1,6 +1,5 @@
<?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
@@ -17,13 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
<configuration>
-
-<!-- file system properties -->
-
+ <!-- file system properties -->
<property>
<name>dfs.name.dir</name>
<!-- cluster variant -->
@@ -33,29 +28,33 @@
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.support.append</name>
<value>true</value>
<description>to enable dfs append</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.webhdfs.enabled</name>
<value>false</value>
<description>to enable webhdfs</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.failed.volumes.tolerated</name>
<value>0</value>
<description>#of failed disks dn would tolerate</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.block.local-path-access.user</name>
<value>hbase</value>
@@ -63,8 +62,9 @@
circuit reads.
</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.data.dir</name>
<value>/mnt/hmc/hadoop/hdfs/data</value>
@@ -75,8 +75,9 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.hosts.exclude</name>
<value>/etc/hadoop/conf/dfs.exclude</value>
@@ -84,8 +85,9 @@
not permitted to connect to the namenode. The full pathname of the
file must be specified. If the value is empty, no hosts are
excluded.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.hosts</name>
<value>/etc/hadoop/conf/dfs.include</value>
@@ -93,28 +95,32 @@
permitted to connect to the namenode. The full pathname of the file
must be specified. If the value is empty, all hosts are
permitted.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.replication</name>
<value>3</value>
<description>Default block replication.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.safemode.threshold.pct</name>
<value>1.0f</value>
@@ -124,8 +130,9 @@
Values less than or equal to 0 mean not to start in safe mode.
Values greater than 1 will make safe mode permanent.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.balance.bandwidthPerSec</name>
<value>6250000</value>
@@ -134,170 +141,190 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.address</name>
<value>0.0.0.0:50010</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.http.address</name>
<value>0.0.0.0:50075</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.block.size</name>
<value>134217728</value>
<description>The default block size for new files.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.http.address</name>
<value>hdp1.cybervisiontech.com.ua:50070</value>
-<description>The name of the default file system. Either the
+ <description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
-<final>true</final>
-</property>
-
-<property>
-<name>dfs.datanode.du.reserved</name>
-<!-- cluster variant -->
-<value>1073741824</value>
-<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
+ <final>true</final>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.du.reserved</name>
+ <!-- cluster variant -->
+ <value>1073741824</value>
+ <description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
</description>
-</property>
-
-<property>
-<name>dfs.datanode.ipc.address</name>
-<value>0.0.0.0:8010</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.ipc.address</name>
+ <value>0.0.0.0:8010</value>
+ <description>
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
-</property>
-
-<property>
-<name>dfs.blockreport.initialDelay</name>
-<value>120</value>
-<description>Delay for first block report in seconds.</description>
-</property>
-
-<property>
-<name>dfs.namenode.handler.count</name>
-<value>40</value>
-<description>The number of server threads for the namenode.</description>
-</property>
-
-<property>
-<name>dfs.datanode.max.xcievers</name>
-<value>1024</value>
-<description>PRIVATE CONFIG VARIABLE</description>
-</property>
-
-<!-- Permissions configuration -->
-
-<property>
-<name>dfs.umaskmode</name>
-<value>077</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.blockreport.initialDelay</name>
+ <value>120</value>
+ <description>Delay for first block report in seconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.handler.count</name>
+ <value>40</value>
+ <description>The number of server threads for the namenode.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.datanode.max.xcievers</name>
+ <value>1024</value>
+ <description>PRIVATE CONFIG VARIABLE</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <!-- Permissions configuration -->
+ <property>
+ <name>dfs.umaskmode</name>
+ <value>077</value>
+ <description>
The octal umask used when creating files and directories.
</description>
-</property>
-
-<property>
-<name>dfs.web.ugi</name>
-<!-- cluster variant -->
-<value>gopher,gopher</value>
-<description>The user account used by the web interface.
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.web.ugi</name>
+ <!-- cluster variant -->
+ <value>gopher,gopher</value>
+ <description>The user account used by the web interface.
Syntax: USERNAME,GROUP1,GROUP2, ...
</description>
-</property>
-
-<property>
-<name>dfs.permissions</name>
-<value>true</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.permissions</name>
+ <value>true</value>
+ <description>
If "true", enable permission checking in HDFS.
If "false", permission checking is turned off,
but all other behavior is unchanged.
Switching from one parameter value to the other does not change the mode,
owner or group of files or directories.
</description>
-</property>
-
-<property>
-<name>dfs.permissions.supergroup</name>
-<value>hdfs</value>
-<description>The name of the group of super-users.</description>
-</property>
-
-<property>
-<name>dfs.namenode.handler.count</name>
-<value>100</value>
-<description>Added to grow Queue size so that more client connections are allowed</description>
-</property>
-
-<property>
-<name>ipc.server.max.response.size</name>
-<value>5242880</value>
-</property>
-<property>
-<name>dfs.block.access.token.enable</name>
-<value>true</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.permissions.supergroup</name>
+ <value>hdfs</value>
+ <description>The name of the group of super-users.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.handler.count</name>
+ <value>100</value>
+ <description>Added to grow Queue size so that more client connections are allowed</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ipc.server.max.response.size</name>
+ <value>5242880</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.block.access.token.enable</name>
+ <value>true</value>
+ <description>
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
-</property>
-
-<property>
-<name>dfs.namenode.kerberos.principal</name>
-<value>nn/_HOST@</value>
-<description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.namenode.kerberos.principal</name>
+ <value>nn/_HOST@</value>
+ <description>
Kerberos principal name for the NameNode
</description>
-</property>
-
-<property>
-<name>dfs.secondary.namenode.kerberos.principal</name>
-<value>nn/_HOST@</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.secondary.namenode.kerberos.principal</name>
+ <value>nn/_HOST@</value>
<description>
Kerberos principal name for the secondary NameNode.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
-
-<!--
+ <!--
This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
-->
<property>
<name>dfs.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
- <description>The Kerberos principal for the host that the NameNode runs on.</description>
-
+ <description>The Kerberos principal for the host that the NameNode runs on.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
<description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description>
-
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<!-- cluster variant -->
<name>dfs.secondary.http.address</name>
<value>hdp2.cybervisiontech.com.ua:50090</value>
<description>Address of secondary namenode web server</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.https.port</name>
<value>50490</value>
<description>The https port where secondary-namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.web.authentication.kerberos.principal</name>
<value>HTTP/_HOST@</value>
@@ -306,8 +333,9 @@ Kerberos principal name for the NameNode
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
<value>/nn.service.keytab</value>
@@ -315,82 +343,91 @@ Kerberos principal name for the NameNode
The Kerberos keytab file with the credentials for the
HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.kerberos.principal</name>
<value>dn/_HOST@</value>
- <description>
+ <description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.keytab.file</name>
<value>/nn.service.keytab</value>
- <description>
+ <description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.secondary.namenode.keytab.file</name>
<value>/nn.service.keytab</value>
- <description>
+ <description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.keytab.file</name>
<value>/dn.service.keytab</value>
- <description>
+ <description>
The filename of the keytab file for the DataNode.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.https.port</name>
<value>50470</value>
- <description>The https port where namenode binds</description>
-
+ <description>The https port where namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.https.address</name>
<value>hdp1.cybervisiontech.com.ua:50470</value>
- <description>The https address where namenode binds</description>
-
+ <description>The https address where namenode binds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.data.dir.perm</name>
<value>750</value>
-<description>The permissions that should be there on dfs.data.dir
+ <description>The permissions that should be there on dfs.data.dir
directories. The datanode will not come up if the permissions are
different on existing dfs.data.dir directories. If the directories
don't exist, they will be created with this permission.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
- <name>dfs.access.time.precision</name>
- <value>0</value>
- <description>The access time for HDFS file is precise up to this value.
+ <name>dfs.access.time.precision</name>
+ <value>0</value>
+ <description>The access time for HDFS file is precise up to this value.
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
-</property>
-
-<property>
- <name>dfs.cluster.administrators</name>
- <value> hdfs</value>
- <description>ACL for who all can view the default servlets in the HDFS</description>
-</property>
-
-<property>
- <name>ipc.server.read.threadpool.size</name>
- <value>5</value>
- <description></description>
-</property>
-
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>dfs.cluster.administrators</name>
+ <value> hdfs</value>
+ <description>ACL for who all can view the default servlets in the HDFS</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ipc.server.read.threadpool.size</name>
+ <value>5</value>
+ <description/>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/test/resources/common-services/MAPREDUCE/1.0/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/common-services/MAPREDUCE/1.0/configuration/hbase-site.xml b/ambari-server/src/test/resources/common-services/MAPREDUCE/1.0/configuration/hbase-site.xml
index 5024e85..38eb42e 100644
--- a/ambari-server/src/test/resources/common-services/MAPREDUCE/1.0/configuration/hbase-site.xml
+++ b/ambari-server/src/test/resources/common-services/MAPREDUCE/1.0/configuration/hbase-site.xml
@@ -29,12 +29,16 @@
in milliseconds. Default is 15. Set this value low if you want unit
tests to be responsive.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.client.pause</name>
<value>5000</value>
<description>General client pause value. Used mostly as value to wait
before running a retry of a failed get, region lookup, etc.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.meta.thread.rescanfrequency</name>
@@ -42,6 +46,8 @@
<description>How long the HMaster sleeps (in milliseconds) between scans of
the root and meta tables.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.server.thread.wakefrequency</name>
@@ -49,6 +55,8 @@
<description>Time to sleep in between searches for work (in milliseconds).
Used as sleep interval by service threads such as META scanner and log roller.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.handler.count</name>
@@ -57,6 +65,8 @@
Same property is used by the HMaster for count of master handlers.
Default is 10.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.lease.period</name>
@@ -66,6 +76,8 @@
value has been reduced so that the master will notice a dead region server
sooner. The default is 30 seconds.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.info.port</name>
@@ -73,6 +85,8 @@
<description>The port for the hbase master web UI
Set to -1 if you do not want the info server to run.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
@@ -80,6 +94,8 @@
<description>The port for the hbase regionserver web UI
Set to -1 if you do not want the info server to run.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.info.port.auto</name>
@@ -88,6 +104,8 @@
search if hbase.regionserver.info.port is already in use.
Enabled for testing to run multiple tests on one machine.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.lease.thread.wakefrequency</name>
@@ -96,6 +114,8 @@
This value has been reduced due to the other reduced values above so that
the master will notice a dead region server sooner. The default is 15 seconds.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.optionalcacheflushinterval</name>
@@ -104,6 +124,8 @@
Amount of time to wait since the last time a region was flushed before
invoking an optional cache flush. Default 60,000.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.safemode</name>
@@ -112,6 +134,8 @@
Turn on/off safe mode in region server. Always on for production, always off
for tests.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -122,10 +146,14 @@
Keep the maximum filesize small so we split more often in tests.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hadoop.log.dir</name>
<value>${user.dir}/../logs</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -133,5 +161,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
</configuration>