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:03:14 UTC
[44/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/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
index 3575bf2..c20d51d 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
@@ -33,6 +33,8 @@
into /tmp. Change this configuration else all data will be lost
on machine restart.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.cluster.distributed</name>
@@ -42,6 +44,8 @@
false, startup will run all HBase and ZooKeeper daemons together
in the one JVM.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.master.port</name>
@@ -52,6 +56,8 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -65,28 +71,38 @@
<value-attributes>
<type>directory</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.local.dir</name>
<value>${hbase.tmp.dir}/local</value>
<description>Directory on the local filesystem to be used as a local storage
</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.bindAddress</name>
<value>0.0.0.0</value>
<description>The bind address for the HBase Master web UI
</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>
<value>60010</value>
<description>The port for the HBase Master web UI.</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>
<value>60030</value>
<description>The port for the HBase RegionServer web UI.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -105,6 +121,8 @@
<maximum>0.8</maximum>
<increment-step>0.01</increment-step>
</value-attributes>
+ <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>
@@ -120,6 +138,8 @@
<maximum>240</maximum>
<increment-step>1</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hregion.majorcompaction</name>
@@ -134,8 +154,9 @@
<maximum>2592000000</maximum>
<unit>milliseconds</unit>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hbase.regionserver.global.memstore.lowerLimit</name>
<value>0.38</value>
@@ -148,11 +169,12 @@
<value-attributes>
<type>float</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
<value>4</value>
- <display-name>HBase Region Block Multiplier</display-name>
<description>
Block updates if a memstore's size spikes this many times above the size that would cause it to be flushed.
Useful to prevent runaway memstores during a sudden spike in update traffic.
@@ -173,6 +195,8 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hregion.memstore.flush.size</name>
@@ -188,6 +212,8 @@
<increment-step>1048576</increment-step>
<unit>B</unit>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hregion.memstore.mslab.enabled</name>
@@ -201,6 +227,8 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <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>
@@ -217,6 +245,8 @@
<unit>B</unit>
<increment-step>1073741824</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.client.scanner.caching</name>
@@ -236,6 +266,8 @@
<increment-step>100</increment-step>
<unit>rows</unit>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>zookeeper.session.timeout</name>
@@ -259,6 +291,8 @@
<unit>milliseconds</unit>
<increment-step>10000</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.client.keyvalue.maxsize</name>
@@ -279,6 +313,8 @@
<unit>B</unit>
<increment-step>262144</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hstore.compactionThreshold</name>
@@ -305,6 +341,8 @@
</entry>
</entries>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.hstore.flush.retries.number</name>
@@ -312,8 +350,9 @@
<description>
The number of times the region flush operation will be retried.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hbase.hstore.blockingStoreFiles</name>
<display-name>hstore blocking storefiles</display-name>
@@ -327,6 +366,8 @@
<value-attributes>
<type>int</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hfile.block.cache.size</name>
@@ -339,8 +380,9 @@
<maximum>0.8</maximum>
<increment-step>0.01</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- Additional configuration specific to HBase security -->
<property>
<name>hbase.superuser</name>
@@ -355,8 +397,9 @@
<name>hbase_user</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hbase.security.authentication</name>
<value>simple</value>
@@ -378,8 +421,9 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hbase.security.authorization</name>
<value>false</value>
@@ -399,8 +443,9 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hbase.coprocessor.region.classes</name>
<value>org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint</value>
@@ -423,11 +468,12 @@
<name>hbase.security.authentication</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hbase.coprocessor.master.classes</name>
- <value></value>
+ <value/>
<description>A comma-separated list of
org.apache.hadoop.hbase.coprocessor.MasterObserver coprocessors that are
loaded by default on the active HMaster process. For any implemented
@@ -444,16 +490,18 @@
<name>hbase.security.authorization</name>
</property>
</depends-on>
+ <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>
<value>2181</value>
<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>
-
<!--
The following three properties are used together to create the list of
host:peer_port:leader_port quorum servers for ZooKeeper.
@@ -471,19 +519,22 @@
<value-attributes>
<type>multiLine</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<!-- End of properties used to generate ZooKeeper host:port quorum list. -->
-
<property>
<name>hbase.zookeeper.useMulti</name>
<value>true</value>
<description>Instructs HBase to make use of ZooKeeper's multi-update functionality.
This allows certain ZooKeeper operations to complete more quickly and prevents some issues
- with rare Replication failure scenarios (see the release note of HBASE-2611 for an example).�
+ with rare Replication failure scenarios (see the release note of HBASE-2611 for an example).·
IMPORTANT: only set this to true if all ZooKeeper servers in the cluster are on version 3.4+
and will not be downgraded. ZooKeeper versions before 3.4 do not support multi-update and will
not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495).
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>zookeeper.znode.parent</name>
@@ -493,6 +544,8 @@
By default, all of HBase's ZooKeeper file path are configured with a
relative path, so they will all go under this directory unless changed.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.client.retries.number</name>
@@ -510,6 +563,8 @@
<maximum>50</maximum>
<increment-step>1</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.rpc.timeout</name>
@@ -527,11 +582,15 @@
<unit>milliseconds</unit>
<increment-step>10000</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hbase.defaults.for.version.skip</name>
<value>true</value>
<description>Disables version verification.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>phoenix.query.timeoutMs</name>
@@ -545,17 +604,20 @@
<unit>milliseconds</unit>
<increment-step>10000</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.domain.socket.path</name>
<value>/var/lib/hadoop-hdfs/dn_socket</value>
<description>Path to domain socket.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hbase.rpc.protection</name>
<value>authentication</value>
+ <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/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
index d216605..a2cb615 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
- <!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -17,19 +16,16 @@
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="true" xmlns:xi="http://www.w3.org/2001/XInclude">
-
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude" supports_final="true">
<property>
<name>ha.failover-controller.active-standby-elector.zk.op.retries</name>
<value>120</value>
<description>ZooKeeper Failover Controller retries setting for your environment</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
-<!-- i/o properties -->
-
+ <!-- i/o properties -->
<property>
<name>io.file.buffer.size</name>
<value>131072</value>
@@ -37,24 +33,26 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>io.serializations</name>
<value>org.apache.hadoop.io.serializer.WritableSerialization</value>
<description> A list of comma-delimited serialization classes that can be used for obtaining serializers and deserializers.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>io.compression.codecs</name>
<value>org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
<description>A list of the compression codec classes that can be used
for compression/decompression.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
-<!-- file system properties -->
-
+ <!-- file system properties -->
<property>
<name>fs.defaultFS</name>
<!-- cluster variant -->
@@ -63,8 +61,9 @@
<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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>fs.trash.interval</name>
<value>360</value>
@@ -74,8 +73,9 @@
If trash is disabled server side then the client side configuration is checked.
If trash is enabled on the server side then the value configured on the server is used and the client configuration value is ignored.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- ipc properties: copied from kryptonite configuration -->
<property>
<name>ipc.client.idlethreshold</name>
@@ -83,22 +83,25 @@
<description>Defines the threshold number of connections after which
connections will be inspected for idleness.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>ipc.client.connection.maxidletime</name>
<value>30000</value>
<description>The maximum time after which a client will bring down the
connection to the server.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>ipc.server.tcpnodelay</name>
<value>true</value>
@@ -108,8 +111,9 @@
decrease latency
with a cost of more/smaller packets.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- Web Interface Configuration -->
<property>
<name>mapreduce.jobtracker.webinterface.trusted</name>
@@ -119,28 +123,32 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
- <property>
- <name>hadoop.security.authentication</name>
- <value>simple</value>
- <description>
+ <property>
+ <name>hadoop.security.authentication</name>
+ <value>simple</value>
+ <description>
Set the authentication for the cluster. Valid values are: simple or
kerberos.
</description>
- </property>
-<property>
- <name>hadoop.security.authorization</name>
- <value>false</value>
- <description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>hadoop.security.authorization</name>
+ <value>false</value>
+ <description>
Enable authorization for different protocols.
</description>
-</property>
-
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
<property>
<name>hadoop.security.auth_to_local</name>
<value>DEFAULT</value>
-<description>The mapping from kerberos principal names to local OS mapreduce.job.user.names.
+ <description>The mapping from kerberos principal names to local OS mapreduce.job.user.names.
So the default rule is just "DEFAULT" which takes all principals in your default domain to their first component.
"omalley@APACHE.ORG" and "omalley/admin@APACHE.ORG" to "omalley", if your default domain is APACHE.ORG.
The translations rules have 3 sections:
@@ -181,6 +189,8 @@ DEFAULT
<value-attributes>
<type>multiLine</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>net.topology.script.file.name</name>
@@ -188,5 +198,7 @@ DEFAULT
<description>
Location of topology script used by Hadoop to determine the rack location of nodes.
</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/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
index 77f9dcf..0501957 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<property>
<name>hdfs_log_dir_prefix</name>
@@ -30,6 +29,8 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hadoop_pid_dir_prefix</name>
@@ -41,6 +42,8 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hadoop_root_logger</name>
@@ -50,6 +53,8 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hadoop_heapsize</name>
@@ -61,6 +66,8 @@
<unit>MB</unit>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>namenode_heapsize</name>
@@ -81,6 +88,8 @@
<name>dfs.datanode.data.dir</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>namenode_opt_newsize</name>
@@ -101,6 +110,8 @@
<increment-step>256</increment-step>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>namenode_opt_maxnewsize</name>
@@ -121,6 +132,8 @@
<increment-step>256</increment-step>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>namenode_opt_permsize</name>
@@ -135,6 +148,8 @@
<increment-step>128</increment-step>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>namenode_opt_maxpermsize</name>
@@ -149,6 +164,8 @@
<increment-step>128</increment-step>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>dtnode_heapsize</name>
@@ -162,6 +179,8 @@
<unit>MB</unit>
<increment-step>128</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>proxyuser_group</name>
@@ -173,6 +192,8 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hdfs_user</name>
@@ -184,6 +205,8 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hdfs_tmp_dir</name>
@@ -196,29 +219,35 @@
<overridable>false</overridable>
<visible>false</visible>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hdfs_user_nofile_limit</name>
<value>128000</value>
<description>Max open files limit setting for HDFS user.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hdfs_user_nproc_limit</name>
<value>65536</value>
<description>Max number of processes limit setting for HDFS user.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hdfs_user_keytab</name>
<description>HDFS keytab path</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hdfs_principal_name</name>
<description>HDFS principal name</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- hadoop-env.sh -->
<property>
<name>content</name>
@@ -329,7 +358,7 @@ export HADOOP_IDENT_STRING=$USER
# Add database libraries
JAVA_JDBC_LIBS=""
if [ -d "/usr/share/java" ]; then
- for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null`
+ for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null`
do
JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
done
@@ -354,7 +383,7 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-a
{% if is_datanode_max_locked_memory_set %}
# Fix temporary bug, when ulimit from conf files is not picked up, without full relogin.
# Makes sense to fix only when runing DN as root
-if [ "$command" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then
+if [ "$command" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then
ulimit -l {{datanode_max_locked_memory}}
fi
{% endif %}
@@ -362,6 +391,7 @@ fi
<value-attributes>
<type>content</type>
</value-attributes>
+ <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/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-policy.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-policy.xml
index 41bde16..c147171 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-policy.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-policy.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,9 +16,7 @@
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="true">
<property>
<name>security.client.protocol.acl</name>
@@ -29,8 +26,9 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>security.client.datanode.protocol.acl</name>
<value>*</value>
@@ -39,8 +37,9 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>security.datanode.protocol.acl</name>
<value>*</value>
@@ -49,8 +48,9 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>security.inter.datanode.protocol.acl</name>
<value>*</value>
@@ -59,8 +59,9 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>security.namenode.protocol.acl</name>
<value>*</value>
@@ -69,8 +70,9 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>security.inter.tracker.protocol.acl</name>
<value>*</value>
@@ -79,8 +81,9 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>security.job.client.protocol.acl</name>
<value>*</value>
@@ -89,8 +92,9 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>security.job.task.protocol.acl</name>
<value>*</value>
@@ -99,17 +103,19 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
- <property>
+ <property>
<name>security.admin.operations.protocol.acl</name>
<value>hadoop</value>
<description>ACL for AdminOperationsProtocol. Used for admin commands.
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>security.refresh.usertogroups.mappings.protocol.acl</name>
<value>hadoop</value>
@@ -118,9 +124,10 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
-<property>
+ <property>
<name>security.refresh.policy.protocol.acl</name>
<value>hadoop</value>
<description>ACL for RefreshAuthorizationPolicyProtocol, used by the
@@ -128,7 +135,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="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/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
index 8bbb2c9..e154d58 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml
@@ -19,9 +19,7 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
-
<property>
<name>content</name>
<display-name>hdfs-log4j template</display-name>
@@ -201,6 +199,7 @@ log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
+ <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/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
index 260fe65..dbe5d96 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.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 supports_final="true">
-
<!-- file system properties -->
-
<property>
<name>dfs.namenode.name.dir</name>
<!-- cluster variant -->
@@ -38,15 +33,17 @@
<type>directories</type>
<overridable>false</overridable>
</value-attributes>
+ <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>true</value>
@@ -57,8 +54,9 @@
<type>boolean</type>
<overridable>false</overridable>
</value-attributes>
+ <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>
@@ -77,8 +75,9 @@
<name>dfs.datanode.data.dir</name>
</property>
</depends-on>
+ <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</name>
<value>/hadoop/hdfs/data</value>
@@ -93,8 +92,9 @@
<value-attributes>
<type>directories</type>
</value-attributes>
+ <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>
@@ -102,8 +102,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>
@@ -114,7 +115,6 @@
permitted.</description>
</property>
-->
-
<property>
<name>dfs.namenode.checkpoint.dir</name>
<value>/hadoop/hdfs/namesecondary</value>
@@ -128,8 +128,9 @@
<type>directories</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.checkpoint.edits.dir</name>
<value>${dfs.namenode.checkpoint.dir}</value>
@@ -139,9 +140,9 @@
replicated in all of the directories for redundancy.
Default value is same as dfs.namenode.checkpoint.dir
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
-
<property>
<name>dfs.namenode.checkpoint.period</name>
<value>21600</value>
@@ -151,8 +152,9 @@
<type>int</type>
<unit>seconds</unit>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.checkpoint.txns</name>
<value>1000000</value>
@@ -160,15 +162,17 @@
of the namespace every 'dfs.namenode.checkpoint.txns' transactions,
regardless of whether 'dfs.namenode.checkpoint.period' has expired.
</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>
@@ -178,14 +182,16 @@
<value-attributes>
<type>int</type>
</value-attributes>
+ <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.namenode.safemode.threshold-pct</name>
<value>0.999</value>
@@ -202,8 +208,9 @@
<maximum>1.000</maximum>
<increment-step>0.001</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.balance.bandwidthPerSec</name>
<value>6250000</value>
@@ -212,46 +219,52 @@
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.https.port</name>
<value>50470</value>
<description>
This property is used by HftpFileSystem.
</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>
The datanode server address and port for data transfer.
</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>
The datanode http server address and port.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.datanode.https.address</name>
<value>0.0.0.0:50475</value>
<description>
The datanode https server address and port.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.blocksize</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.namenode.http-address</name>
<value>localhost:50070</value>
@@ -259,15 +272,17 @@
<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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.rpc-address</name>
<value>localhost:8020</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>RPC address that handles all clients requests.</description>
+ <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 -->
@@ -285,8 +300,9 @@
<name>dfs.datanode.data.dir</name>
</property>
</depends-on>
+ <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>
@@ -294,14 +310,16 @@
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="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.datanode.max.transfer.threads</name>
<value>1024</value>
@@ -312,18 +330,19 @@
<minimum>0</minimum>
<maximum>48000</maximum>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- Permissions configuration -->
-
<property>
<name>fs.permissions.umask-mode</name>
<value>022</value>
<description>
The octal umask used when creating files and directories.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.permissions.enabled</name>
<value>true</value>
@@ -334,14 +353,16 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.permissions.superusergroup</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>
@@ -352,8 +373,9 @@
<minimum>1</minimum>
<maximum>200</maximum>
</value-attributes>
+ <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>
@@ -361,25 +383,26 @@
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="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<!-- cluster variant -->
<name>dfs.namenode.secondary.http-address</name>
<value>localhost:50090</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<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.namenode.https-address</name>
<value>localhost:50470</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<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>
@@ -391,8 +414,9 @@
<value-attributes>
<type>int</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.accesstime.precision</name>
<value>0</value>
@@ -404,14 +428,16 @@
<value-attributes>
<type>int</type>
</value-attributes>
+ <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>dfs.namenode.avoid.read.stale.datanode</name>
<value>true</value>
@@ -420,6 +446,8 @@
heartbeat messages have not been received by the namenode for more than a
specified time interval.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>dfs.namenode.avoid.write.stale.datanode</name>
@@ -429,6 +457,8 @@
heartbeat messages have not been received by the namenode for more than a
specified time interval.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>dfs.namenode.write.stale.datanode.ratio</name>
@@ -436,35 +466,40 @@
<description>When the ratio of number stale datanodes to total datanodes marked is greater
than this ratio, stop avoiding writing to stale nodes so as to prevent causing hotspots.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>dfs.namenode.stale.datanode.interval</name>
<value>30000</value>
<description>Datanode is stale after not getting a heartbeat in this interval in ms</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.journalnode.http-address</name>
<value>0.0.0.0:8480</value>
<description>The address and port the JournalNode web UI listens on.
If the port is 0 then the server will start on a free port. </description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.journalnode.https-address</name>
<value>0.0.0.0:8481</value>
<description>The address and port the JournalNode HTTPS server listens on.
If the port is 0 then the server will start on a free port. </description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.journalnode.edits.dir</name>
<value>/grid/0/hdfs/journal</value>
<description>The path where the JournalNode daemon will store its local state. </description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- HDFS Short-Circuit Local Reads -->
-
<property>
<name>dfs.client.read.shortcircuit</name>
<value>true</value>
@@ -475,8 +510,9 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.domain.socket.path</name>
<value>/var/lib/hadoop-hdfs/dn_socket</value>
@@ -484,8 +520,9 @@
This is a path to a UNIX domain socket that will be used for communication between the DataNode and local HDFS clients.
If the string "_PORT" is present in this path, it will be replaced by the TCP port of 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.client.read.shortcircuit.streams.cache.size</name>
<value>4096</value>
@@ -495,15 +532,17 @@
more file descriptors, but potentially provide better performance on
workloads involving lots of seeks.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.name.dir.restore</name>
<value>true</value>
<description>Set to true to enable NameNode to attempt recovering a previously failed dfs.namenode.name.dir.
When enabled, a recovery of any failed directory is attempted during checkpoint.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.http.policy</name>
<value>HTTP_ONLY</value>
@@ -512,6 +551,7 @@
The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY :
Service is provided only on https - HTTP_AND_HTTPS : Service is provided both on http and https
</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/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml
index 809d5c5..f198565 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.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
@@ -18,47 +17,61 @@
limitations under the License.
-->
<configuration>
- <property>
- <name>ssl.client.truststore.location</name>
- <value>/etc/security/clientKeys/all.jks</value>
- <description>Location of the trust store file.</description>
- </property>
- <property>
- <name>ssl.client.truststore.type</name>
- <value>jks</value>
- <description>Optional. Default value is "jks".</description>
- </property>
- <property>
- <name>ssl.client.truststore.password</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password to open the trust store file.</description>
- <value-attributes>
- <type>password</type>
- </value-attributes>
- </property>
- <property>
- <name>ssl.client.truststore.reload.interval</name>
- <value>10000</value>
- <description>Truststore reload interval, in milliseconds.</description>
- </property>
- <property>
- <name>ssl.client.keystore.type</name>
- <value>jks</value>
- <description>Optional. Default value is "jks".</description>
- </property>
- <property>
- <name>ssl.client.keystore.location</name>
- <value>/etc/security/clientKeys/keystore.jks</value>
- <description>Location of the keystore file.</description>
- </property>
- <property>
- <name>ssl.client.keystore.password</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password to open the keystore file.</description>
- <value-attributes>
- <type>password</type>
- </value-attributes>
- </property>
+ <property>
+ <name>ssl.client.truststore.location</name>
+ <value>/etc/security/clientKeys/all.jks</value>
+ <description>Location of the trust store file.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.client.truststore.type</name>
+ <value>jks</value>
+ <description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.client.truststore.password</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password to open the trust store file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.client.truststore.reload.interval</name>
+ <value>10000</value>
+ <description>Truststore reload interval, in milliseconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.client.keystore.type</name>
+ <value>jks</value>
+ <description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.client.keystore.location</name>
+ <value>/etc/security/clientKeys/keystore.jks</value>
+ <description>Location of the keystore file.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.client.keystore.password</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password to open the keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+ <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/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml
index 32199c0..176efaa 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.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
@@ -18,56 +17,72 @@
limitations under the License.
-->
<configuration>
- <property>
- <name>ssl.server.truststore.location</name>
- <value>/etc/security/serverKeys/all.jks</value>
- <description>Location of the trust store file.</description>
- </property>
- <property>
- <name>ssl.server.truststore.type</name>
- <value>jks</value>
- <description>Optional. Default value is "jks".</description>
- </property>
- <property>
- <name>ssl.server.truststore.password</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password to open the trust store file.</description>
- <value-attributes>
- <type>password</type>
- </value-attributes>
- </property>
- <property>
- <name>ssl.server.truststore.reload.interval</name>
- <value>10000</value>
- <description>Truststore reload interval, in milliseconds.</description>
- </property>
- <property>
- <name>ssl.server.keystore.type</name>
- <value>jks</value>
- <description>Optional. Default value is "jks".</description>
- </property>
- <property>
- <name>ssl.server.keystore.location</name>
- <value>/etc/security/serverKeys/keystore.jks</value>
- <description>Location of the keystore file.</description>
- </property>
- <property>
- <name>ssl.server.keystore.password</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password to open the keystore file.</description>
- <value-attributes>
- <type>password</type>
- </value-attributes>
- </property>
- <property>
- <name>ssl.server.keystore.keypassword</name>
- <value>bigdata</value>
- <property-type>PASSWORD</property-type>
- <description>Password for private key in keystore file.</description>
- <value-attributes>
- <type>password</type>
- </value-attributes>
- </property>
+ <property>
+ <name>ssl.server.truststore.location</name>
+ <value>/etc/security/serverKeys/all.jks</value>
+ <description>Location of the trust store file.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.server.truststore.type</name>
+ <value>jks</value>
+ <description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.server.truststore.password</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password to open the trust store file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.server.truststore.reload.interval</name>
+ <value>10000</value>
+ <description>Truststore reload interval, in milliseconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.server.keystore.type</name>
+ <value>jks</value>
+ <description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.server.keystore.location</name>
+ <value>/etc/security/serverKeys/keystore.jks</value>
+ <description>Location of the keystore file.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.server.keystore.password</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password to open the keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
+ <property>
+ <name>ssl.server.keystore.keypassword</name>
+ <value>bigdata</value>
+ <property-type>PASSWORD</property-type>
+ <description>Password for private key in keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+ <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/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml
index b239561..0fd1c06 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hcat-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<!-- hcat-env.sh -->
<property>
@@ -56,6 +55,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <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/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index 15d07dd..ee83ff0 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<property>
<name>hive.client.heapsize</name>
@@ -34,8 +33,9 @@
<increment-step>512</increment-step>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.heapsize</name>
<value>1024</value>
@@ -48,8 +48,9 @@
<unit>MB</unit>
<increment-step>512</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive_database_type</name>
<value>mysql</value>
@@ -64,6 +65,8 @@
<name>hive_database</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hive_database</name>
@@ -75,11 +78,15 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hive_ambari_database</name>
<value>MySQL</value>
<description>Database type.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hive_database_name</name>
@@ -91,6 +98,8 @@
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hive_log_dir</name>
@@ -101,6 +110,8 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hive_pid_dir</name>
@@ -112,6 +123,8 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hive_user</name>
@@ -123,10 +136,10 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!--HCAT-->
-
<property>
<name>hcat_log_dir</name>
<value>/var/log/webhcat</value>
@@ -136,6 +149,8 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hcat_pid_dir</name>
@@ -147,6 +162,8 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>hcat_user</name>
@@ -158,6 +175,8 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>webhcat_user</name>
@@ -169,20 +188,23 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive_user_nofile_limit</name>
<value>32000</value>
<description>Max open files limit setting for HIVE user.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive_user_nproc_limit</name>
<value>16000</value>
<description>Max number of processes limit setting for HIVE user.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- hive-env.sh -->
<property>
<name>content</name>
@@ -234,6 +256,7 @@ export HADOOP_CLASSPATH={{atlas_conf_dir}}:{{atlas_home_dir}}/hook/hive:${HADOOP
<value-attributes>
<type>content</type>
</value-attributes>
+ <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/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
index b7f4200..7ce7e47 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-exec-log4j.xml
@@ -19,9 +19,7 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
-
<property>
<name>content</name>
<display-name>hive-exec-log4j template</display-name>
@@ -111,6 +109,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,FA
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
+ <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/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
index d017530..b6675cf 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-log4j.xml
@@ -19,9 +19,7 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
-
<property>
<name>content</name>
<display-name>hive-log4j template</display-name>
@@ -120,6 +118,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,DRFA
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
</configuration>