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 14:20:29 UTC
[69/94] ambari git commit: AMBARI-17112. Fixed implementation of
on-ambari-upgrade support. Update all stack configuration xmls to pass
validation (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
index 7112a18..185056e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
@@ -21,14 +21,12 @@
<property>
<name>yarn.node-labels.manager-class</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.recovery.enabled</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.acl.enable</name>
@@ -40,8 +38,7 @@
<name>ranger-yarn-plugin-enabled</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.authorization-provider</name>
@@ -52,8 +49,7 @@
<name>ranger-yarn-plugin-enabled</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.admin.acl</name>
@@ -62,37 +58,32 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!--ats v1.5 properties-->
<property>
<name>yarn.timeline-service.version</name>
<value>1.5</value>
<description>Timeline service version we’re currently using.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.store-class</name>
<value>org.apache.hadoop.yarn.server.timeline.EntityGroupFSTimelineStore</value>
<description>Main storage class for YARN timeline server.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.active-dir</name>
<value>/ats/active/</value>
<description>DFS path to store active application’s timeline data</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.done-dir</name>
<value>/ats/done/</value>
<description>DFS path to store done application’s timeline data</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes</name>
@@ -101,36 +92,31 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- advanced ats v1.5 properties-->
<property>
<name>yarn.timeline-service.entity-group-fs-store.summary-store</name>
<!-- Use rolling leveldb, advanced -->
<value>org.apache.hadoop.yarn.server.timeline.RollingLevelDBTimelineStore</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.scan-interval-seconds</name>
<!-- Default is 60 seconds, advanced -->
<value>60</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.cleaner-interval-seconds</name>
<!-- 3600 is default, advanced -->
<value>3600</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.retain-seconds</name>
<!-- 7 days is default, advanced -->
<value>604800</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml
index 43eadea..4e4d23d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml
@@ -22,14 +22,12 @@
<value>mapreduce_shuffle,spark_shuffle</value>
<description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can
not start with numbers</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.nodemanager.aux-services.spark_shuffle.class</name>
<value>org.apache.spark.network.yarn.YarnShuffleService</value>
<description>The auxiliary service class to use for Spark</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
index 2c4426b..0b45f48 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
@@ -24,182 +24,156 @@
<name>atlas.server.ha.enabled</name>
<value>false</value>
<description>Atlas high availability feature toggle.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.server.ids</name>
- <value></value>
+ <value/>
<description>List of Atlas server ids for HA feature.</description>
<value-attributes>
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.server.address.id1</name>
- <value></value>
+ <value/>
<description>Mapping of Atlas server ids to hosts.</description>
<value-attributes>
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.graph.storage.backend</name>
<value>hbase</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.graph.storage.hostname</name>
- <value></value>
+ <value/>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.audit.hbase.zookeeper.quorum</name>
- <value></value>
+ <value/>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.graph.index.search.backend</name>
<value>solr5</value>
<description>The Atlas indexing backend (e.g. solr5).</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.graph.index.search.solr.mode</name>
<value>cloud</value>
<description>The Solr mode (e.g. cloud).</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.graph.index.search.solr.zookeeper-url</name>
- <value></value>
+ <value/>
<description>The ZooKeeper quorum setup for Solr as comma separated value.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.login.method</name>
<value>file</value>
<description>Atlas login method (e.g. file).</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.login.credentials.file</name>
<value>{{conf_dir}}/users-credentials.properties</value>
<description>File path for file based login.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.auth.policy.file</name>
<value>{{conf_dir}}/policy-store.txt</value>
<description>Path for the Atlas policy file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.kafka.data</name>
<value>{{metadata_home}}/data/kafka</value>
<description>The Kafka data directory.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.kafka.bootstrap.servers</name>
- <value></value>
+ <value/>
<description>Comma separated list of Kafka broker endpoints in host:port form</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.kafka.zookeeper.connect</name>
- <value></value>
+ <value/>
<description>Comma separated list of servers forming Zookeeper quorum used by Kafka.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.kafka.hook.group.id</name>
<value>atlas</value>
<description>Kafka group id for the hook topic.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.kafka.entities.group.id</name>
<value>entities</value>
<description>Kafka group id for the entity topic.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.kafka.auto.commit.enable</name>
<value>false</value>
<description>Kafka auto commit setting for Atlas notifications.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.lineage.schema.query.hive_table</name>
<value>hive_table where __guid='%s'\, columns</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.lineage.schema.query.Table</name>
<value>Table where __guid='%s'\, columns</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.lineage.hive.table.type.name</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.lineage.hive.table.schema.query.hive_table</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.lineage.hive.table.schema.query.Table</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.lineage.hive.process.type.name</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.lineage.hive.process.inputs.name</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.lineage.hive.process.outputs.name</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml
index 6015845..d59445d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml
@@ -27,8 +27,7 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property require-input="false">
<name>metadata_pid_dir</name>
@@ -37,8 +36,7 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>metadata_user</name>
@@ -50,22 +48,19 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>metadata_opts</name>
<value>-Xmx1024m -Dlog4j.configuration=atlas-log4j.xml</value>
<description>Metadata Server command line options.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>metadata_classpath</name>
<value> </value>
<description>Metadata Server additional classpath.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property require-input="false">
<name>metadata_data_dir</name>
@@ -74,15 +69,13 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property require-input="false">
<name>metadata_expanded_war_dir</name>
<value>./server/webapp</value>
<description>Atlas expanded WAR directory.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>metadata_conf_file</name>
@@ -93,22 +86,19 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas_solr_shards</name>
<value>1</value>
<description>The number of shards set for LogSearch SOLR.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas_solr_shards</name>
<value>1</value>
<description>The number of shards set for collections created in LogSearch SOLR.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- metadata-env.sh -->
<property>
@@ -150,7 +140,6 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml
index 4c90207..71ea4ef 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml
@@ -24,8 +24,7 @@
<name>*.shared.libs</name>
<value>activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3,commons-el</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.application.services</name>
@@ -41,42 +40,36 @@
org.apache.falcon.metadata.MetadataMappingService
</value>
<description>Falcon application services</description>
- <on-ambari-upgrade add="false" change="true" delete="false"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.feed.lifecycle.policies</name>
<value>org.apache.falcon.lifecycle.retention.AgeBasedDelete</value>
<description>Feed lifecycle policy</description>
- <on-ambari-upgrade add="false" change="true" delete="false"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.lifecycle.engine.impl</name>
<value>org.apache.falcon.lifecycle.engine.oozie.OoziePolicyBuilderFactory</value>
<description>Feed lifecycle engine</description>
- <on-ambari-upgrade add="false" change="true" delete="false"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.extension.store.uri</name>
<value>/apps/falcon/extensions</value>
<description>Extension store uri</description>
- <on-ambari-upgrade add="false" change="true" delete="false"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.feed.lifecycle.policy.builders</name>
<value>org.apache.falcon.lifecycle.engine.oozie.retention.AgeBasedDeleteBuilder</value>
<description>Feed lifecycle policies</description>
- <on-ambari-upgrade add="false" change="true" delete="false"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.shared.libs</name>
<value>activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3,commons-el</value>
<description>Falcon shared libraries</description>
- <on-ambari-upgrade add="false" change="true" delete="false"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml
index 6a3084e..d6db13d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml
@@ -22,7 +22,6 @@
<property>
<name>hbase.master.ui.readonly</name>
<value>false</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml
index ddec304..df5dd31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml
@@ -22,43 +22,36 @@
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml
index 596cce4..4f71e2d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml
@@ -23,43 +23,36 @@
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml
index 3d13ad6..68fe67a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml
@@ -75,7 +75,6 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml
index 34439fb..f46744d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml
@@ -79,7 +79,6 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml
index 1914657..38042ed 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml
@@ -96,7 +96,6 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index 04d4533..37d76d0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -40,8 +40,7 @@
</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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive_server_interactive_host</name>
@@ -51,8 +50,7 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>llap_queue_capacity</name>
@@ -79,8 +77,7 @@
<name>yarn.scheduler.capacity.root.queues</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>num_llap_nodes</name>
@@ -112,8 +109,7 @@
<name>hive.server2.tez.sessions.per.default.queue</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>num_retries_for_checking_llap_status</name>
@@ -126,8 +122,7 @@
<maximum>20</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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>llap_heap_size</name>
@@ -159,8 +154,7 @@
<name>hive.server2.tez.sessions.per.default.queue</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>slider_am_container_mb</name>
@@ -193,32 +187,28 @@
<name>hive.server2.tez.sessions.per.default.queue</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>llap_log_level</name>
<value>INFO</value>
<description>LLAP app logging level (WARN/INFO/DEBUG/TRACE)</description>
<display-name>LLAP app logging level (WARN/INFO/DEBUG/TRACE)</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>llap_app_name</name>
<value>llap0</value>
<description>LLAP app name</description>
<display-name>LLAP app name</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>llap_java_opts</name>
<value>-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200</value>
<description>Java opts for llap application</description>
<display-name>LLAP app java opts</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- hive-env.sh -->
<property>
@@ -274,7 +264,6 @@
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
index 62823a2..00052a9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
@@ -28,15 +28,13 @@ limitations under the License.
<overridable>false</overridable>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.server2.thrift.http.port</name>
<value>10501</value>
<description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'http'.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.server2.tez.sessions.per.default.queue</name>
@@ -69,8 +67,7 @@ limitations under the License.
<name>yarn.scheduler.capacity.root.queues</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.metastore.uris</name>
@@ -79,8 +76,7 @@ limitations under the License.
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.server2.enable.doAs</name>
@@ -110,8 +106,7 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<!-- This is different for Hive batch and interactive -->
@@ -133,8 +128,7 @@ limitations under the License.
</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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.tez.java.opts</name>
@@ -143,8 +137,7 @@ limitations under the License.
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.vectorized.execution.reduce.enabled</name>
@@ -168,8 +161,7 @@ limitations under the License.
</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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.server2.tez.default.queues</name>
@@ -200,8 +192,7 @@ limitations under the License.
<name>hive.llap.daemon.queue.name</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.server2.tez.initialize.default.sessions</name>
@@ -226,8 +217,7 @@ limitations under the License.
</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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.driver.parallel.compilation</name>
@@ -250,29 +240,25 @@ limitations under the License.
</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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.server2.webui.port</name>
<value>10502</value>
<description>Web UI port address</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.server2.webui.use.ssl</name>
<value>false</value>
<description>Enable SSL for HiveServer2 Interactive</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.server2.zookeeper.namespace</name>
<value>hiveserver2-hive2</value>
<description>The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.queue.name</name>
@@ -299,26 +285,22 @@ limitations under the License.
<name>enable_hive_interactive</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.yarn.shuffle.port</name>
<value>15551</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.execution.mode</name>
<value>llap</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.execution.mode</name>
<value>all</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.io.enabled</name>
@@ -329,62 +311,52 @@ limitations under the License.
<name>hive.llap.io.memory.size</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.io.use.lrfu</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.auto.allow.uber</name>
<value>false</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.object.cache.enabled</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.tez.input.generate.consistent.splits</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.client.consistent.splits</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.task.scheduler.locality.delay</name>
<value>-1</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.exec.orc.split.strategy</name>
<value>HYBRID</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.service.hosts</name>
<value>@llap0</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.allow.permanent.fns</name>
<value>false</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.io.memory.size</name>
@@ -418,8 +390,7 @@ limitations under the License.
<name>hive.server2.tez.sessions.per.default.queue</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.num.executors</name>
@@ -451,20 +422,17 @@ limitations under the License.
<name>hive.server2.tez.sessions.per.default.queue</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.memory.per.instance.mb</name>
<value>250</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.vcpus.per.instance</name>
<value>${hive.llap.daemon.num.executors}</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.yarn.container.mb</name>
@@ -498,92 +466,77 @@ limitations under the License.
<name>hive.server2.tez.sessions.per.default.queue</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>llap.shuffle.connection-keep-alive.enable</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>llap.shuffle.connection-keep-alive.timeout</name>
<value>60</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.io.threadpool.size</name>
<value>4</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.rpc.port</name>
<value>15001</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.management.rpc.port</name>
<value>15004</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.task.scheduler.enable.preemption</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.tez.exec.print.summary</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.vectorized.execution.mapjoin.native.enabled</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.vectorized.execution.mapjoin.minmax.enabled</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.vectorized.execution.mapjoin.native.fast.hashtable.enabled</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.mapjoin.hybridgrace.hashtable</name>
<value>false</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.tez.bucket.pruning</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.optimize.dynamic.partition.hashjoin</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.daemon.work.dirs</name>
<value>${yarn.nodemanager.local-dirs}</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.zk.sm.connectionString</name>
@@ -594,13 +547,11 @@ limitations under the License.
<name>clientPort</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.llap.io.memory.mode</name>
<value>none</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml
index 27f4934..2b153ba 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml
@@ -103,7 +103,6 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
index fb81154..e4d69f2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml
@@ -21,14 +21,12 @@ limitations under the License.
<name>hive.metastore.schema.verification.record.version</name>
<value>false</value>
<description>Prevents metastore from overwriting the version number</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.metastore.schema.verification</name>
<value>false</value>
<description>Prevents metastore from complaining about version difference</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
index 08981e4..569af7b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml
@@ -23,25 +23,21 @@ limitations under the License.
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.service.metrics.reporter</name>
<value>JSON_FILE, JMX, HADOOP2</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.service.metrics.hadoop2.component</name>
<value>hivemetastore</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.service.metrics.file.location</name>
<value>/var/log/hive/hivemetastore-report.json</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
index 92f21ae..94d6a38 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml
@@ -23,25 +23,21 @@ limitations under the License.
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.service.metrics.reporter</name>
<value>JSON_FILE, JMX, HADOOP2</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.service.metrics.hadoop2.component</name>
<value>hiveserver2</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hive.service.metrics.file.location</name>
<value>/var/log/hive/hiveserver2-report.json</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml
index 621aa61..d73b0ca 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml
@@ -104,7 +104,6 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml
index 1d3760e..9f6c26b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml
@@ -135,7 +135,6 @@ rootLogger.appenderRef.root.ref = ${sys:llap.daemon.root.logger}
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml
index ddec304..df5dd31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml
@@ -22,43 +22,36 @@
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
index 18d0a09..33d0908 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml
@@ -17,14 +17,12 @@
limitations under the License.
-->
<configuration supports_final="true">
-
<property>
<name>tez.runtime.shuffle.fetch.buffer.percent</name>
<value>0.6</value>
<description>Fraction (0-1) of the available memory which can be used to
retain shuffled data</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>tez.runtime.shuffle.memory.limit.percent</name>
@@ -32,38 +30,31 @@
<description>This property determines the maximum size of a shuffle segment
which can be fetched to memory. Fraction (0-1) of shuffle memory
(after applying tez.runtime.shuffle.fetch.buffer.percent)</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
-
<property>
<name>tez.runtime.report.partition.stats</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>tez.runtime.pipelined-shuffle.enabled</name>
<value>false</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>tez.runtime.pipelined.sorter.lazy-allocate.memory</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>tez.grouping.node.local.only</name>
<value>true</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>tez.runtime.shuffle.fetch.verify-disk-checksum</name>
<value>false</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml
index ddec304..df5dd31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml
@@ -22,43 +22,36 @@
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml
index a72edfc..b2e2e61 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml
@@ -121,7 +121,6 @@
<empty-value-valid>true</empty-value-valid>
<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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml
index ddec304..df5dd31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml
@@ -22,43 +22,36 @@
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml
index 6a835b0..eee836f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml
@@ -23,8 +23,7 @@
<name>ranger.tagsync.dest.ranger.ssl.config.filename</name>
<value>/usr/hdp/current/ranger-tagsync/conf/mytruststore.jks</value>
<description>Truststore used for tagsync, required if tagsync -> ranger admin communication is SSL enabled</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.keystore.filename</name>
@@ -33,7 +32,6 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml
index 3e56d5e..eab9dab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml
@@ -20,15 +20,13 @@
<name>ranger.usersync.keystore.file</name>
<value>/usr/hdp/current/ranger-usersync/conf/unixauthservice.jks</value>
<description>Keystore file used for usersync</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.truststore.file</name>
<value>/usr/hdp/current/ranger-usersync/conf/mytruststore.jks</value>
<description>Truststore used for usersync, required if usersync -> ranger admin communication is SSL enabled</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.ldap.bindkeystore</name>
@@ -37,21 +35,18 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.credstore.filename</name>
<value>/usr/hdp/current/ranger-usersync/conf/ugsync.jceks</value>
<description>Credential store file name for user sync, specify full path</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.policymgr.keystore</name>
<value>/usr/hdp/current/ranger-usersync/conf/ugsync.jceks</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml
index 82b2317..59fd594 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml
@@ -34,8 +34,7 @@
</entries>
</value-attributes>
<description>HSM type</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.hsm.enabled</name>
@@ -58,16 +57,14 @@
</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"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.hsm.partition.name</name>
<display-name>HSM partition name. In case of HSM HA enter the group name</display-name>
<value>par19</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.hsm.partition.password</name>
@@ -77,16 +74,14 @@
<type>password</type>
</value-attributes>
<description>HSM partition password</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.hsm.partition.password.alias</name>
<display-name>HSM partition password alias</display-name>
<value>ranger.kms.hsm.partition.password</value>
<description>HSM partition password alias</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.kerberos.principal</name>
@@ -95,8 +90,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.kerberos.keytab</name>
@@ -105,7 +99,6 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>