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/09 15:02:09 UTC
[44/70] ambari git commit: AMBARI-17112. Fixed implementation of
on-ambari-upgrade support. Update all stack configuration xmls to pass
validation. Change defaults (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/hdfs-site.xml
index 6f96077..34960a9 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/hdfs-site.xml
@@ -28,28 +28,28 @@
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.support.append</name>
<value>true</value>
<description>to enable dfs append</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.webhdfs.enabled</name>
<value>false</value>
<description>to enable webhdfs</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.local-path-access.user</name>
@@ -58,7 +58,7 @@
circuit reads.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.data.dir</name>
@@ -70,7 +70,7 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.hosts.exclude</name>
@@ -79,7 +79,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.hosts</name>
@@ -88,27 +88,27 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.replication</name>
<value>3</value>
<description>Default block replication.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.safemode.threshold.pct</name>
@@ -119,7 +119,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.balance.bandwidthPerSec</name>
@@ -129,23 +129,23 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.address</name>
<value>0.0.0.0:50010</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.http.address</name>
<value>0.0.0.0:50075</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.size</name>
<value>134217728</value>
<description>The default block size for new files.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.http.address</name>
@@ -153,7 +153,7 @@
<description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.du.reserved</name>
@@ -161,7 +161,7 @@ literal string "local" or a host:port for HDFS.</description>
<value>1073741824</value>
<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.ipc.address</name>
@@ -170,25 +170,25 @@ literal string "local" or a host:port for HDFS.</description>
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.blockreport.initialDelay</name>
<value>120</value>
<description>Delay for first block report in seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.max.xcievers</name>
<value>1024</value>
<description>PRIVATE CONFIG VARIABLE</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Permissions configuration -->
<property>
@@ -197,7 +197,7 @@ If the port is 0 then the server will start on a free port.
<description>
The octal umask used when creating files and directories.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.ugi</name>
@@ -206,7 +206,7 @@ The octal umask used when creating files and directories.
<description>The user account used by the web interface.
Syntax: USERNAME,GROUP1,GROUP2, ...
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions</name>
@@ -218,24 +218,24 @@ 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>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions.supergroup</name>
<value>hdfs</value>
<description>The name of the group of super-users.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.server.max.response.size</name>
<value>5242880</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.access.token.enable</name>
@@ -244,7 +244,7 @@ owner or group of files or directories.
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.kerberos.principal</name>
@@ -252,7 +252,7 @@ If "false", no access tokens are checked on accessing datanodes.
<description>
Kerberos principal name for the NameNode
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.kerberos.principal</name>
@@ -260,7 +260,7 @@ Kerberos principal name for the NameNode
<description>
Kerberos principal name for the secondary NameNode.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
@@ -269,26 +269,26 @@ Kerberos principal name for the NameNode
<name>dfs.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
<description>The Kerberos principal for the host that the NameNode runs on.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.https.port</name>
<value>50490</value>
<description>The https port where secondary-namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.authentication.kerberos.principal</name>
@@ -298,7 +298,7 @@ Kerberos principal name for the NameNode
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
@@ -307,7 +307,7 @@ 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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.kerberos.principal</name>
@@ -315,7 +315,7 @@ Kerberos principal name for the NameNode
<description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.keytab.file</name>
@@ -323,7 +323,7 @@ Kerberos principal name for the NameNode
<description>
Combined keytab file containing the namenode service and host principals.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.keytab.file</name>
@@ -331,7 +331,7 @@ Kerberos principal name for the NameNode
<description>
Combined keytab file containing the namenode service and host principals.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.keytab.file</name>
@@ -339,19 +339,19 @@ Kerberos principal name for the NameNode
<description>
The filename of the keytab file for the DataNode.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.https.port</name>
<value>50470</value>
<description>The https port where namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.https.address</name>
<value>hdp1.cybervisiontech.com.ua:50470</value>
<description>The https address where namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.data.dir.perm</name>
@@ -360,7 +360,7 @@ Kerberos principal name for the NameNode
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.access.time.precision</name>
@@ -369,18 +369,18 @@ don't exist, they will be created with this permission.</description>
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.server.read.threadpool.size</name>
<value>5</value>
<description/>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/mapred-site.xml
index 8a4f566..257e045 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/configuration/mapred-site.xml
@@ -28,28 +28,28 @@
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.support.append</name>
<value>true</value>
<description>to enable dfs append</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.webhdfs.enabled</name>
<value>false</value>
<description>to enable webhdfs</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.local-path-access.user</name>
@@ -58,7 +58,7 @@
circuit reads.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.data.dir</name>
@@ -70,7 +70,7 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.hosts.exclude</name>
@@ -79,7 +79,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.hosts</name>
@@ -88,27 +88,27 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.replication</name>
<value>3</value>
<description>Default block replication.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.safemode.threshold.pct</name>
@@ -119,7 +119,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.balance.bandwidthPerSec</name>
@@ -129,25 +129,25 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.size</name>
<value>134217728</value>
<description>The default block size for new files.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.http.address</name>
@@ -155,7 +155,7 @@
<description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.du.reserved</name>
@@ -163,7 +163,7 @@ literal string "local" or a host:port for HDFS.</description>
<value>1073741824</value>
<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.ipc.address</name>
@@ -172,25 +172,25 @@ literal string "local" or a host:port for HDFS.</description>
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.blockreport.initialDelay</name>
<value>120</value>
<description>Delay for first block report in seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.max.xcievers</name>
<value>1024</value>
<description>PRIVATE CONFIG VARIABLE</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Permissions configuration -->
<property>
@@ -199,7 +199,7 @@ If the port is 0 then the server will start on a free port.
<description>
The octal umask used when creating files and directories.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.ugi</name>
@@ -208,7 +208,7 @@ The octal umask used when creating files and directories.
<description>The user account used by the web interface.
Syntax: USERNAME,GROUP1,GROUP2, ...
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions</name>
@@ -220,25 +220,25 @@ 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>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions.supergroup</name>
<value>hdfs</value>
<description>The name of the group of super-users.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.server.max.response.size</name>
<value>5242880</value>
<description>The max response size for IPC</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.access.token.enable</name>
@@ -247,7 +247,7 @@ owner or group of files or directories.
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.kerberos.principal</name>
@@ -255,7 +255,7 @@ If "false", no access tokens are checked on accessing datanodes.
<description>
Kerberos principal name for the NameNode
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.kerberos.principal</name>
@@ -263,7 +263,7 @@ Kerberos principal name for the NameNode
<description>
Kerberos principal name for the secondary NameNode.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
@@ -272,26 +272,26 @@ Kerberos principal name for the NameNode
<name>dfs.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
<description>The Kerberos principal for the host that the NameNode runs on.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.https.port</name>
<value>50490</value>
<description>The https port where secondary-namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.authentication.kerberos.principal</name>
@@ -301,7 +301,7 @@ Kerberos principal name for the NameNode
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
@@ -310,7 +310,7 @@ 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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.kerberos.principal</name>
@@ -318,7 +318,7 @@ Kerberos principal name for the NameNode
<description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.keytab.file</name>
@@ -326,7 +326,7 @@ Kerberos principal name for the NameNode
<description>
Combined keytab file containing the namenode service and host principals.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.keytab.file</name>
@@ -334,7 +334,7 @@ Kerberos principal name for the NameNode
<description>
Combined keytab file containing the namenode service and host principals.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.keytab.file</name>
@@ -342,19 +342,19 @@ Kerberos principal name for the NameNode
<description>
The filename of the keytab file for the DataNode.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.https.port</name>
<value>50470</value>
<description>The https port where namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.https.address</name>
<value>hdp1.cybervisiontech.com.ua:50470</value>
<description>The https address where namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.data.dir.perm</name>
@@ -363,7 +363,7 @@ Kerberos principal name for the NameNode
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.access.time.precision</name>
@@ -372,18 +372,18 @@ don't exist, they will be created with this permission.</description>
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.server.read.threadpool.size</name>
<value>5</value>
<description>IPC thread size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-policy.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-policy.xml
index 497dd02..e72dc75 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-policy.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-policy.xml
@@ -28,7 +28,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.admin.protocol.acl</name>
@@ -38,7 +38,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.masterregion.protocol.acl</name>
@@ -48,6 +48,6 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-site.xml
index ddadf09..ebeb52c 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/configuration/hbase-site.xml
@@ -32,7 +32,7 @@
into /tmp. Change this configuration else all data will be lost
on machine restart.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.cluster.distributed</name>
@@ -42,7 +42,7 @@
false, startup will run all HBase and ZooKeeper daemons together
in the one JVM.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -52,26 +52,26 @@
than '/tmp' (The '/tmp' directory is often cleared on
machine restart).
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.bindAddress</name>
<value/>
<description>The bind address for the HBase Master web UI
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.port</name>
<value/>
<description>The port for the HBase Master web UI.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
<value/>
<description>The port for the HBase RegionServer web UI.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -79,7 +79,7 @@
<description>Maximum size of all memstores in a region server before new
updates are blocked and flushes are forced. Defaults to 40% of heap
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.handler.count</name>
@@ -88,7 +88,7 @@
Same property is used by the Master for count of master handlers.
Default is 10.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.majorcompaction</name>
@@ -97,7 +97,7 @@
HStoreFiles in a region. Default: 1 day.
Set to 0 to disable automated major compactions.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.lease.thread.wakefrequency</name>
@@ -106,7 +106,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.lowerLimit</name>
@@ -117,7 +117,7 @@
the minimum possible flushing to occur when updates are blocked due to
memstore limiting.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
@@ -129,7 +129,7 @@
resultant flush files take a long time to compact or split, or
worse, we OOME
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.flush.size</name>
@@ -139,7 +139,7 @@
exceeds this number of bytes. Value is checked by a thread that runs
every hbase.server.thread.wakefrequency.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.mslab.enabled</name>
@@ -150,7 +150,7 @@
heavy write loads. This can reduce the frequency of stop-the-world
GC pauses on large heaps.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -160,7 +160,7 @@
grown to exceed this value, the hosting HRegion is split in two.
Default: 1G.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.scanner.caching</name>
@@ -172,7 +172,7 @@
Do not set this value such that the time between invocations is greater
than the scanner timeout; i.e. hbase.regionserver.lease.period
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper.session.timeout</name>
@@ -184,7 +184,7 @@
"The client sends a requested timeout, the server responds with the
timeout that it can give the client. " In milliseconds.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.keyvalue.maxsize</name>
@@ -196,7 +196,7 @@
to set this to a fraction of the maximum region size. Setting it to zero
or less disables the check.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.compactionThreshold</name>
@@ -207,7 +207,7 @@
is run to rewrite all HStoreFiles files as one. Larger numbers
put off compaction but when it runs, it takes longer to complete.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.blockingStoreFiles</name>
@@ -218,7 +218,7 @@
blocked for this HRegion until a compaction is completed, or
until hbase.hstore.blockingWaitTime has been exceeded.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hfile.block.cache.size</name>
@@ -228,7 +228,7 @@
used by HFile/StoreFile. Default of 0.25 means allocate 25%.
Set to 0 to disable but it's not recommended.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- The following properties configure authentication information for
HBase processes when using Kerberos security. There are no default
@@ -239,7 +239,7 @@
<description>Full path to the kerberos keytab file to use for logging in
the configured HMaster server principal.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.kerberos.principal</name>
@@ -250,7 +250,7 @@
portion, it will be replaced with the actual hostname of the running
instance.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.keytab.file</name>
@@ -258,7 +258,7 @@
<description>Full path to the kerberos keytab file to use for logging in
the configured HRegionServer server principal.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.kerberos.principal</name>
@@ -270,7 +270,7 @@
running instance. An entry for this principal must exist in the file
specified in hbase.regionserver.keytab.file
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Additional configuration specific to HBase security -->
<property>
@@ -280,7 +280,7 @@
full privileges, regardless of stored ACLs, across the cluster.
Only used when HBase security is enabled.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.coprocessor.region.classes</name>
@@ -291,7 +291,7 @@
it in HBase's classpath and add the fully qualified class name here.
A coprocessor can also be loaded on demand by setting HTableDescriptor.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.coprocessor.master.classes</name>
@@ -303,7 +303,7 @@
implementing your own MasterObserver, just put it in HBase's classpath
and add the fully qualified class name here.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -311,7 +311,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
The following three properties are used together to create the list of
@@ -327,7 +327,7 @@
list of ZooKeeper quorum servers. If HBASE_MANAGES_ZK is set in hbase-env.sh
this is the list of servers which we will start/stop ZooKeeper on.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- End of properties used to generate ZooKeeper host:port quorum list. -->
<property>
@@ -338,7 +338,7 @@
You must ensure that this config. is true serverside too when running hbase
(You will have to restart your cluster after setting it).
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.client.read.shortcircuit</name>
@@ -347,13 +347,13 @@
Hadoop servers should be configured to allow short circuit read
for the hbase user for this to take effect
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.client.read.shortcircuit.skip.checksum</name>
<value/>
<description>Enable/disbale skipping the checksum check</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.optionalcacheflushinterval</name>
@@ -362,6 +362,6 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/core-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/core-site.xml
index 99503ef..99a5456 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/core-site.xml
@@ -26,25 +26,25 @@
The size of this buffer should probably be a multiple of hardware
page size (4096 on Intel x86), and it determines how much data is
buffered during read and write operations.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>io.serializations</name>
<value>org.apache.hadoop.io.serializer.WritableSerialization</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>io.compression.codecs</name>
<value/>
<description>A list of the compression codec classes that can be used
for compression/decompression.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>io.compression.codec.lzo.class</name>
<value>com.hadoop.compression.lzo.LzoCodec</value>
<description>The implementation for lzo codec.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- file system properties -->
<property>
@@ -54,7 +54,7 @@
<description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.trash.interval</name>
@@ -62,7 +62,7 @@
<description>Number of minutes between trash checkpoints.
If zero, the trash feature is disabled.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.checkpoint.dir</name>
@@ -72,7 +72,7 @@
If this is a comma-delimited list of directories then the image is
replicated in all of the directories for redundancy.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.checkpoint.edits.dir</name>
@@ -83,14 +83,14 @@
replicated in all of the directoires for redundancy.
Default value is same as fs.checkpoint.dir
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.checkpoint.period</name>
<value>21600</value>
<description>The number of seconds between two periodic checkpoints.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.checkpoint.size</name>
@@ -98,7 +98,7 @@
<description>The size of the current edit log (in bytes) that triggers
a periodic checkpoint even if the fs.checkpoint.period hasn't expired.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- ipc properties: copied from kryptonite configuration -->
<property>
@@ -107,7 +107,7 @@
<description>Defines the threshold number of connections after which
connections will be inspected for idleness.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.client.connection.maxidletime</name>
@@ -115,13 +115,13 @@
<description>The maximum time after which a client will bring down the
connection to the server.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.client.connect.max.retries</name>
<value>50</value>
<description>Defines the maximum number of retries for IPC connections.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Web Interface Configuration -->
<property>
@@ -132,7 +132,7 @@
not be exposed to public. Enable this option if the interfaces
are only reachable by those who have the right authorization.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.security.authentication</name>
@@ -141,7 +141,7 @@
Set the authentication for the cluster. Valid values are: simple or
kerberos.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.security.authorization</name>
@@ -149,7 +149,7 @@
<description>
Enable authorization for different protocols.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.security.auth_to_local</name>
@@ -192,7 +192,7 @@ If you want to treat all principals from APACHE.ORG with /admin as "admin", your
RULE[2:$1%$2@$0](.%admin@APACHE.ORG)s/./admin/
DEFAULT
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hadoop-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hadoop-policy.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hadoop-policy.xml
index cbeb136..a99eaec 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hadoop-policy.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hadoop-policy.xml
@@ -26,7 +26,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.client.datanode.protocol.acl</name>
@@ -36,7 +36,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.datanode.protocol.acl</name>
@@ -46,7 +46,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.inter.datanode.protocol.acl</name>
@@ -56,7 +56,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.namenode.protocol.acl</name>
@@ -66,7 +66,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.inter.tracker.protocol.acl</name>
@@ -76,7 +76,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.job.submission.protocol.acl</name>
@@ -86,7 +86,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.task.umbilical.protocol.acl</name>
@@ -96,7 +96,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.admin.operations.protocol.acl</name>
@@ -105,7 +105,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.refresh.usertogroups.mappings.protocol.acl</name>
@@ -115,7 +115,7 @@
group names. The user and group list is separated by a blank. For
e.g. "alice,bob users,wheel". A special value of "*" means all
users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.refresh.policy.protocol.acl</name>
@@ -125,6 +125,6 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hdfs-site.xml
index ac4279f..2bf9d48 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/configuration/hdfs-site.xml
@@ -28,34 +28,34 @@
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.support.append</name>
<value/>
<description>to enable dfs append</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.webhdfs.enabled</name>
<value/>
<description>to enable webhdfs</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.socket.write.timeout</name>
<value>0</value>
<description>DFS Client write socket timeout</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.failed.volumes.tolerated</name>
<value/>
<description>#of failed disks dn would tolerate</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.local-path-access.user</name>
@@ -64,7 +64,7 @@
circuit reads.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.data.dir</name>
@@ -76,7 +76,7 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.hosts.exclude</name>
@@ -85,7 +85,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.hosts</name>
@@ -94,27 +94,27 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.replication</name>
<value/>
<description>Default block replication.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.safemode.threshold.pct</name>
@@ -125,7 +125,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.balance.bandwidthPerSec</name>
@@ -135,23 +135,23 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.address</name>
<value/>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.http.address</name>
<value/>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.size</name>
<value>134217728</value>
<description>The default block size for new files.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.http.address</name>
@@ -159,7 +159,7 @@
<description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.du.reserved</name>
@@ -167,7 +167,7 @@ literal string "local" or a host:port for HDFS.</description>
<value/>
<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.ipc.address</name>
@@ -176,25 +176,25 @@ literal string "local" or a host:port for HDFS.</description>
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.blockreport.initialDelay</name>
<value>120</value>
<description>Delay for first block report in seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.max.xcievers</name>
<value>4096</value>
<description>PRIVATE CONFIG VARIABLE</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Permissions configuration -->
<property>
@@ -203,7 +203,7 @@ If the port is 0 then the server will start on a free port.
<description>
The octal umask used when creating files and directories.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.ugi</name>
@@ -212,7 +212,7 @@ The octal umask used when creating files and directories.
<description>The user account used by the web interface.
Syntax: USERNAME,GROUP1,GROUP2, ...
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions</name>
@@ -224,24 +224,24 @@ 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>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions.supergroup</name>
<value>hdfs</value>
<description>The name of the group of super-users.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.server.max.response.size</name>
<value>5242880</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.access.token.enable</name>
@@ -250,7 +250,7 @@ owner or group of files or directories.
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.kerberos.principal</name>
@@ -258,7 +258,7 @@ If "false", no access tokens are checked on accessing datanodes.
<description>
Kerberos principal name for the NameNode
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.kerberos.principal</name>
@@ -266,7 +266,7 @@ Kerberos principal name for the NameNode
<description>
Kerberos principal name for the secondary NameNode.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
@@ -275,26 +275,26 @@ Kerberos principal name for the NameNode
<name>dfs.namenode.kerberos.https.principal</name>
<value/>
<description>The Kerberos principal for the host that the NameNode runs on.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.kerberos.https.principal</name>
<value/>
<description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<!-- cluster variant -->
<name>dfs.secondary.http.address</name>
<value/>
<description>Address of secondary namenode web server</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.https.port</name>
<value>50490</value>
<description>The https port where secondary-namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.authentication.kerberos.principal</name>
@@ -304,7 +304,7 @@ Kerberos principal name for the NameNode
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
@@ -313,7 +313,7 @@ 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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.kerberos.principal</name>
@@ -321,7 +321,7 @@ Kerberos principal name for the NameNode
<description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.keytab.file</name>
@@ -329,7 +329,7 @@ Kerberos principal name for the NameNode
<description>
Combined keytab file containing the namenode service and host principals.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.keytab.file</name>
@@ -337,7 +337,7 @@ Kerberos principal name for the NameNode
<description>
Combined keytab file containing the namenode service and host principals.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.keytab.file</name>
@@ -345,19 +345,19 @@ Kerberos principal name for the NameNode
<description>
The filename of the keytab file for the DataNode.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.https.port</name>
<value>50470</value>
<description>The https port where namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.https.address</name>
<value/>
<description>The https address where namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.data.dir.perm</name>
@@ -366,7 +366,7 @@ Kerberos principal name for the NameNode
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.access.time.precision</name>
@@ -375,24 +375,24 @@ don't exist, they will be created with this permission.</description>
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.server.read.threadpool.size</name>
<value>5</value>
<description/>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.failed.volumes.tolerated</name>
<value>0</value>
<description>Number of failed disks datanode would tolerate</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/configuration/hive-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/configuration/hive-site.xml
index a80b508..818d2f7 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/configuration/hive-site.xml
@@ -22,110 +22,110 @@ limitations under the License.
<value>false</value>
<description>controls whether to connect to remove metastore server or
open a new metastore server in Hive Client JVM</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value/>
<description>JDBC connect string for a JDBC metastore</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>com.mysql.jdbc.Driver</value>
<description>Driver class name for a JDBC metastore</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>javax.jdo.option.ConnectionUserName</name>
<value/>
<description>username to use against metastore database</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>javax.jdo.option.ConnectionPassword</name>
<value/>
<description>password to use against metastore database</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.warehouse.dir</name>
<value>/apps/hive/warehouse</value>
<description>location of default database for the warehouse</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.sasl.enabled</name>
<value/>
<description>If true, the metastore thrift interface will be secured with SASL.
Clients must authenticate with Kerberos.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.kerberos.keytab.file</name>
<value/>
<description>The path to the Kerberos Keytab file containing the metastore
thrift server's service principal.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.kerberos.principal</name>
<value/>
<description>The service principal for the metastore thrift server. The special
string _HOST will be replaced automatically with the correct host name.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.cache.pinobjtypes</name>
<value>Table,Database,Type,FieldSchema,Order</value>
<description>List of comma separated metastore object types that should be pinned in the cache</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.uris</name>
<value/>
<description>URI for client to contact metastore server</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.clientside.fs.operations</name>
<value>true</value>
<description>FS operations are owned by client</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.client.socket.timeout</name>
<value>60</value>
<description>MetaStore Client socket timeout in seconds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.execute.setugi</name>
<value>true</value>
<description>In unsecure mode, setting this property to true will cause the metastore to execute DFS operations using the client's reported user and group permissions. Note that this property must be set on both the client and server sides. Further note that its best effort. If client sets its to true and server sets it to false, client setting will be ignored.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.authorization.enabled</name>
<value>true</value>
<description>enable or disable the hive client authorization</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.authorization.manager</name>
<value>org.apache.hcatalog.security.HdfsAuthorizationProvider</value>
<description>the hive client authorization manager class name.
The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.enable.doAs</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.hdfs.impl.disable.cache</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/capacity-scheduler.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
index a9ee700..6dcb279 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
@@ -26,7 +26,7 @@
<description>Maximum number of jobs in the system which can be initialized,
concurrently, by the CapacityScheduler.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.queue.default.capacity</name>
@@ -34,7 +34,7 @@
<description>Percentage of the number of slots in the cluster that are
to be available for jobs in this queue.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.queue.default.maximum-capacity</name>
@@ -53,7 +53,7 @@
the max capacity would change. So if large no of nodes or racks get added to the cluster , max Capacity in
absolute terms would increase accordingly.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.queue.default.supports-priority</name>
@@ -61,7 +61,7 @@
<description>If true, priorities of jobs will be taken into
account in scheduling decisions.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.queue.default.minimum-user-limit-percent</name>
@@ -77,7 +77,7 @@
or more users, no user can use more than 25% of the queue's resources. A
value of 100 implies no user limits are imposed.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.queue.default.user-limit-factor</name>
@@ -85,7 +85,7 @@
<description>The multiple of the queue capacity which can be configured to
allow a single user to acquire more slots.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.queue.default.maximum-initialized-active-tasks</name>
@@ -94,7 +94,7 @@
which can be initialized concurrently. Once the queue's jobs exceed this
limit they will be queued on disk.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.queue.default.maximum-initialized-active-tasks-per-user</name>
@@ -103,7 +103,7 @@
user's jobs in the queue, which can be initialized concurrently. Once the
user's jobs exceed this limit they will be queued on disk.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.queue.default.init-accept-jobs-factor</name>
@@ -111,7 +111,7 @@
<description>The multipe of (maximum-system-jobs * queue-capacity) used to
determine the number of jobs which are accepted by the scheduler.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- The default configuration settings for the capacity task scheduler -->
<!-- The default values would be applied to all the queues which don't have -->
@@ -122,7 +122,7 @@
<description>If true, priorities of jobs will be taken into
account in scheduling decisions by default in a job queue.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.default-minimum-user-limit-percent</name>
@@ -130,7 +130,7 @@
<description>The percentage of the resources limited to a particular user
for the job queue at any given point of time by default.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.default-user-limit-factor</name>
@@ -138,7 +138,7 @@
<description>The default multiple of queue-capacity which is used to
determine the amount of slots a single user can consume concurrently.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.default-maximum-active-tasks-per-queue</name>
@@ -147,7 +147,7 @@
queue, which can be initialized concurrently. Once the queue's jobs exceed
this limit they will be queued on disk.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.default-maximum-active-tasks-per-user</name>
@@ -156,7 +156,7 @@
the user's jobs in the queue, which can be initialized concurrently. Once
the user's jobs exceed this limit they will be queued on disk.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.default-init-accept-jobs-factor</name>
@@ -164,7 +164,7 @@
<description>The default multipe of (maximum-system-jobs * queue-capacity)
used to determine the number of jobs which are accepted by the scheduler.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Capacity scheduler Job Initialization configuration parameters -->
<property>
@@ -173,7 +173,7 @@
<description>The amount of time in miliseconds which is used to poll
the job queues for jobs to initialize.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.capacity-scheduler.init-worker-threads</name>
@@ -186,6 +186,6 @@
is greater then number of threads would be equal to number of
job queues.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml
index 94be6ac..36b3f29 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml
@@ -22,12 +22,12 @@
<property>
<name>mapred.queue.default.acl-submit-job</name>
<value>*</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred.queue.default.acl-administer-jobs</name>
<value>*</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- END ACLs -->
</configuration>