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/01 15:26:04 UTC
[21/94] ambari git commit: AMBARI-16272. Ambari Upgrade shouldn't
automatically add stack configs (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/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 bfa0fd2..42973d1 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
@@ -19,40 +19,46 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/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 d418fed..ef43aea 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
@@ -19,11 +19,9 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
- <!-- topology file -->
-
- <property>
+ <!-- topology file -->
+ <property>
<name>content</name>
<display-name>knoxsso-topology template</display-name>
<value>
@@ -119,9 +117,11 @@
The configuration specifies the KnoxSSO provider integration, cookie and token management details.
</description>
<value-attributes>
- <type>content</type>
- <empty-value-valid>true</empty-value-valid>
- <show-property-name>false</show-property-name>
+ <type>content</type>
+ <empty-value-valid>true</empty-value-valid>
+ <show-property-name>false</show-property-name>
</value-attributes>
- </property>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/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 bfa0fd2..42973d1 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
@@ -19,40 +19,46 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/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 56fa75e..1560394 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
@@ -18,15 +18,14 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="true">
-
<property>
<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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.tagsync.keystore.filename</name>
<value>/usr/hdp/current/ranger-tagsync/conf/rangertagsync.jceks</value>
@@ -34,6 +33,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/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 4718ce6..4e18ea8 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
@@ -15,40 +15,43 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration>
-
<property>
<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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.usersync.ldap.bindkeystore</name>
- <value></value>
+ <value/>
<description>Set same value as ranger.usersync.keystore.file property i.e default value /usr/hdp/current/ranger-usersync/conf/ugsync.jceks</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.usersync.policymgr.keystore</name>
<value>/usr/hdp/current/ranger-usersync/conf/ugsync.jceks</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/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 66f8b79..2040db1 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
@@ -18,9 +18,7 @@
* limitations under the License.
*/
-->
-
<configuration>
-
<property>
<name>ranger.ks.hsm.type</name>
<display-name>HSM Type</display-name>
@@ -36,8 +34,9 @@
</entries>
</value-attributes>
<description>HSM type</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.ks.hsm.enabled</name>
<display-name>HSM Enabled</display-name>
@@ -59,15 +58,17 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.ks.hsm.partition.password</name>
<value>_</value>
@@ -76,31 +77,35 @@
<type>password</type>
</value-attributes>
<description>HSM partition password</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.ks.kerberos.principal</name>
- <value></value>
- <description></description>
+ <value/>
+ <description/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.ks.kerberos.keytab</name>
- <value></value>
- <description></description>
+ <value/>
+ <description/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml
index 1093e37..f3362fd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml
@@ -19,16 +19,16 @@
*/
-->
<configuration supports_adding_forbidden="true">
-
<property>
<name>hsm_partition_password</name>
<display-name>HSM partition password</display-name>
- <value></value>
+ <value/>
<property-type>PASSWORD</property-type>
<value-attributes>
<type>password</type>
</value-attributes>
<description>HSM partition password</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml
index fa3fe07..b5de2c9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml
@@ -19,42 +19,48 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.solr.urls</name>
<value>{{ranger_audit_solr_urls}}</value>
@@ -68,8 +74,9 @@
<name>ranger.audit.solr.urls</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.solr.zookeepers</name>
<value>none</value>
@@ -80,6 +87,7 @@
<name>ranger.audit.solr.zookeepers</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
index b2d979e..961bd5d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
@@ -19,17 +19,18 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/hdp/current/storm-client/conf/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.policymgr.clientssl.truststore</name>
<value>/usr/hdp/current/storm-client/conf/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml
index f2c3bb7..60bb521 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml
@@ -19,11 +19,11 @@
*/
-->
<configuration>
-
<property>
<name>ranger.plugin.storm.policy.rest.ssl.config.file</name>
<value>/usr/hdp/current/storm-client/conf/ranger-policymgr-ssl.xml</value>
<description>Path to the file containing SSL details to contact Ranger Admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml
index 3a871ac..86b7796 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/storm-site.xml
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-->
-
-<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>java.library.path</name>
<value>/usr/local/lib:/opt/local/lib:/usr/lib:/usr/hdp/current/storm-client/lib</value>
@@ -26,8 +25,9 @@
for the java.library.path value. java.library.path tells the JVM where
to look for native libraries. It is necessary to set this config correctly since
Storm uses the ZeroMQ and JZMQ native libs. </description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>nimbus.childopts</name>
<value>-Xmx1024m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM</value>
@@ -35,8 +35,9 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>worker.childopts</name>
<value>-Xmx768m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-client/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-client/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM</value>
@@ -44,8 +45,9 @@
<value-attributes>
<type>multiLine</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>supervisor.childopts</name>
<value>-Xmx256m _JAAS_PLACEHOLDER -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port={{jmxremote_port}} -javaagent:/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM</value>
@@ -53,6 +55,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/capacity-scheduler.xml
index b36a1f1..b85ee72 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/capacity-scheduler.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,9 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
-
<property>
<name>capacity-scheduler</name>
<depends-on>
@@ -30,6 +29,7 @@
</property>
</depends-on>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-audit.xml
index bfa0fd2..42973d1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-audit.xml
@@ -19,40 +19,46 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.password</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.credential.provider.file</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
index cd992bc..05c1e7c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/yarn-site.xml
@@ -16,27 +16,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
<property>
<name>yarn.nodemanager.aux-services</name>
<value>mapreduce_shuffle,spark_shuffle,spark2_shuffle</value>
<description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and cannot start with numbers</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>yarn.nodemanager.aux-services.spark2_shuffle.class</name>
<value>org.apache.spark.network.yarn.YarnShuffleService</value>
<description>The auxiliary service class to use for Spark 2</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>yarn.nodemanager.aux-services.spark_shuffle.classpath</name>
<value>/usr/hdp/${hdp.version}/spark/aux/*</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>yarn.nodemanager.aux-services.spark2_shuffle.classpath</name>
<value>/usr/hdp/${hdp.version}/spark2/aux/*</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/configuration/zeppelin-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/configuration/zeppelin-env.xml
index cf2b9bc..a80afb3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/configuration/zeppelin-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/configuration/zeppelin-env.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.
-->
-
<configuration>
-
<property>
<name>zeppelin_env_content</name>
<description>This is the jinja template for zeppelin-env.sh file</description>
@@ -112,6 +109,7 @@ export SPARK_YARN_USER_ENV="PYTHONPATH=${PYTHONPATH}"
# export ZEPPELIN_SPARK_MAXRESULT
</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
index 58af341..93abcca 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration>
<property>
<name>hadoop.user.name</name>
@@ -33,6 +32,8 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>hadoop.user.password</name>
@@ -45,16 +46,22 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>security_enabled</name>
<value>false</value>
<description>Hadoop Security</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>kerberos_domain</name>
<value>EXAMPLE.COM</value>
<description>Kerberos realm.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ignore_groupsusers_create</name>
@@ -67,6 +74,8 @@
<type>boolean</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>smokeuser</name>
@@ -79,11 +88,15 @@
<visible>false</visible>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>smokeuser_keytab</name>
<value>/etc/security/keytabs/smokeuser.headless.keytab</value>
<description>Path to smoke test user keytab file</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>user_group</name>
@@ -96,5 +109,7 @@
<visible>false</visible>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
index efb44d1..85300d6 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
@@ -17,11 +17,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<configuration supports_adding_forbidden="true">
<property>
<name>ams_user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metrics_collector_log_dir</name>
@@ -31,6 +32,8 @@
<value-attributes>
<type>directory</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metrics_collector_pid_dir</name>
@@ -40,6 +43,8 @@
<value-attributes>
<type>directory</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metrics_monitor_pid_dir</name>
@@ -49,6 +54,8 @@
<value-attributes>
<type>directory</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>metrics_monitor_log_dir</name>
@@ -58,8 +65,9 @@
<value-attributes>
<type>directory</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>content</name>
<value>
@@ -67,6 +75,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
index 086ff90..b2f0db9 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
@@ -19,23 +19,27 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<property>
<name>hbase_log_dir</name>
<value>c:\hadoop\logs\ams-hbase</value>
<description>Log Directories for HBase.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_pid_dir</name>
<value>c:\hadoop\run\ams-hbase</value>
<description>Pid Directory for HBase.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- hbase-env.cmd -->
<property>
<name>content</name>
@@ -45,6 +49,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
index 1023413..cd01c5d 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
@@ -31,6 +31,8 @@
default HBase writes into /tmp. Change this configuration else all data
will be lost on machine restart.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -41,5 +43,7 @@
than '/tmp' (The '/tmp' directory is often cleared on
machine restart).
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
index 8d02656..18c5072 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
@@ -17,9 +17,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
-
<property>
<name>content</name>
<description>Custom log4j.properties</description>
@@ -57,6 +55,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
index a68c912..14d8632 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
@@ -29,5 +29,7 @@
Directory to store aggregator checkpoints. Change to a permanent
location so that checkpoint ar not lost.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
index 93ef1f5..e6e3274 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/configuration/falcon-env.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
@@ -22,6 +23,8 @@
<property>
<name>falcon_user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>falcon_log_dir</name>
@@ -32,6 +35,8 @@
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>falcon_pid_dir</name>
@@ -42,20 +47,25 @@
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>falcon_local_dir</name>
<value>c:\hadoop\falcon</value>
<display-name>Falcon data directory</display-name>
<description>Directory where Falcon data, such as activemq data, is stored.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!--embeddedmq properties-->
<property>
<name>falcon.embeddedmq.data</name>
<value>c:\hadoop\falcon\embeddedmq\data</value>
<description>Directory in which embeddedmq data is stored.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- falcon-env.cmd -->
<property>
<name>content</name>
@@ -65,5 +75,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml
index 71f5a8e..33e6a07 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-conf.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
<property>
<name>content</name>
@@ -34,5 +33,7 @@
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
index e06d75f..7efd22a 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FLUME/configuration/flume-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<!-- flume-env.ps1 -->
<property>
@@ -56,5 +55,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
index 208d14f..0794a6c 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<property>
<name>hbase_log_dir</name>
@@ -30,6 +29,8 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_pid_dir</name>
@@ -40,13 +41,15 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hbase_user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- hbase-env.cmd -->
<property>
<name>content</name>
@@ -118,5 +121,7 @@ set HBASE_USE_GC_LOGFILE=true
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
index 5f834d7..64d5532 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-site.xml
@@ -23,6 +23,8 @@
<property>
<name>dfs.domain.socket.path</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -33,5 +35,7 @@
than '/tmp' (The '/tmp' directory is often cleared on
machine restart).
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml
index 2d406fc..17541d8 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/core-site.xml
@@ -1,7 +1,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,11 +16,12 @@
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>hadoop.tmp.dir</name>
<value>c:\hadoop\temp\hadoop</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
index 83cbd4b..6a52b64 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml
@@ -21,9 +21,7 @@
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
<configuration supports_adding_forbidden="true">
<property>
<name>hdfs_log_dir_prefix</name>
@@ -34,6 +32,8 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hadoop_pid_dir_prefix</name>
@@ -44,16 +44,21 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>proxyuser_group</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hdfs_user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- hadoop-env.cmd -->
<property>
<name>content</name>
@@ -153,7 +158,9 @@ set HADOOP_SECURE_DN_PID_DIR=%HADOOP_PID_DIR%
set HADOOP_IDENT_STRING=%USERNAME%
</value>
<value-attributes>
- <type>content</type>
+ <type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
index f0b0a01..aafdbca 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml
@@ -1,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,10 +16,8 @@
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>dfs.namenode.name.dir</name>
<value>file:///c:/hdpdata/hdfs/nn</value>
@@ -33,6 +30,8 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>dfs.datanode.data.dir</name>
@@ -45,6 +44,8 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>dfs.hosts.exclude</name>
@@ -53,6 +54,8 @@
not permitted to connect to the namenode. The full pathname of the
file must be specified. If the value is empty, no hosts are
excluded.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>dfs.hosts</name>
@@ -61,6 +64,8 @@
permitted to connect to the namenode. The full pathname of the file
must be specified. If the value is empty, all hosts are
permitted.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>dfs.namenode.checkpoint.dir</name>
@@ -74,24 +79,32 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>dfs.client.read.shortcircuit</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>dfs.client.read.shortcircuit.streams.cache.size</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>dfs.domain.socket.path</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>dfs.journalnode.edits.dir</name>
<value>c:\hadoop\hdfs\journalnode</value>
<description>The path where the JournalNode daemon will store its local state. </description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
index 243196c..735d804 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hcat-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<!-- hcat-env.cmd -->
<property>
@@ -30,5 +29,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
index d0bba93..53ddba7 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<property>
<name>hive_database_type</name>
@@ -35,6 +34,8 @@
<name>hive_database</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive_database</name>
@@ -46,11 +47,15 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive_ambari_database</name>
<value>MSSQL</value>
<description>Database type.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive_log_dir</name>
@@ -61,6 +66,8 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive_pid_dir</name>
@@ -71,12 +78,15 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive_user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!--HCAT-->
<property>
<name>hcat_log_dir</name>
@@ -87,6 +97,8 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hcat_pid_dir</name>
@@ -97,16 +109,21 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hcat_user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>webhcat_user</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- hive-env.cmd -->
<property>
<name>content</name>
@@ -116,5 +133,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
index 4074368..312eef1 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/hive-site.xml
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
<configuration supports_final="true">
-
<!-- Windows specific properties -->
<property>
<name>javax.jdo.option.ConnectionURL</name>
@@ -12,8 +10,9 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>com.microsoft.sqlserver.jdbc.SQLServerDriver</value>
@@ -22,44 +21,51 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>datanucleus.autoCreateSchema</name>
<value>false</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.querylog.location</name>
<value>c:\hadoop\logs\hive</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.log.dir</name>
<value>c:\hadoop\logs\hive</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- New/Updated properties for 2.1 -->
<property>
<name>hive.metastore.kerberos.keytab.file</name>
<value>/etc/security/keytabs/hive.service.keytab</value>
<description>The path to the Kerberos Keytab file containing the metastore
thrift server's service principal.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.kerberos.principal</name>
<value>hive/_HOST@EXAMPLE.COM</value>
<description>The service principal for the metastore thrift server. The special
string _HOST will be replaced automatically with the correct host name.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.enforce.sortmergebucketmapjoin</name>
<value>true</value>
<description>If the user asked for sort-merge bucketed map-side join, and it cannot be performed, should the query fail or not</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.optimize.reducededuplication.min.reducer</name>
<value>4</value>
@@ -67,65 +73,75 @@
That means if reducer-num of the child RS is fixed (order by or forced bucketing) and small, it can make very slow, single MR.
The optimization will be disabled if number of reducers is less than specified value.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.execution.enabled</name>
<value>true</value>
<description>This flag controls the vectorized mode of query execution as documented in HIVE-4160 (as of Hive 0.13.0)
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.execution.engine</name>
<value>mr</value>
<description>Whether to use MR or Tez</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.post.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
<description>Comma-separated list of post-execution hooks to be invoked for each statement.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.pre.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
<description>Comma-separated list of pre-execution hooks to be invoked for each statement.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.failure.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
<description>Comma-separated list of on-failure hooks to be invoked for each statement.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.maxentries</name>
<value>100000</value>
<description>Max number of entries in the vector group by aggregation hashtables.
Exceeding this will trigger a flush irrelevant of memory pressure condition.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.checkinterval</name>
<value>1024</value>
<description>Number of entries added to the group by aggregation hash before a reocmputation of average entry size is performed.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.flush.percent</name>
<value>0.1</value>
<description>Percent of entries in the group by aggregation hash flushed when the memory treshold is exceeded.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.stats.autogather</name>
<value>true</value>
<description>A flag to gather statistics automatically during the INSERT OVERWRITE command.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.tez.container.size</name>
<value>682</value>
@@ -148,20 +164,23 @@
<name>yarn.scheduler.maximum-allocation-mb</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.tez.input.format</name>
<value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value>
<description>The default input format for Tez. Tez groups splits in the Application Master.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.tez.java.opts</name>
<value>-server -Xmx545m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps</value>
<description>Java command line options for Tez. The -Xmx parameter value is generally 80% of hive.tez.container.size.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compute.query.using.stats</name>
<value>true</value>
@@ -170,8 +189,9 @@
stored in metastore. For basic stats collection turn on the config hive.stats.autogather to true.
For more advanced stats collection need to run analyze table queries.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.orc.splits.include.file.footer</name>
<value>false</value>
@@ -179,56 +199,65 @@
If turned on splits generated by orc will include metadata about the stripes in the file. This
data is read remotely (from the client or HS2 machine) and sent to all the tasks.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.limit.optimize.enable</name>
<value>true</value>
<description>Whether to enable the optimization of trying a smaller subset of data for simple LIMIT first.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.limit.pushdown.memory.usage</name>
<value>0.04</value>
<description>The max memory to be used for hash in RS operator for top K selection.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.default.queues</name>
<value>default</value>
<description>A comma-separated list of queues configured for the cluster.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.sessions.per.default.queue</name>
<value>1</value>
<description>The number of sessions for each queue named in the hive.server2.tez.default.queues.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.initialize.default.sessions</name>
<value>false</value>
<description>Enables a user to use HiveServer2 without enabling Tez for HiveServer2. Users may potentially may want to run queries with Tez without a pool of sessions.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.txn.manager</name>
<value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value>
<description>Select the class to do transaction management. The default DummyTxnManager does no transactions and retains the legacy behavior.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.txn.timeout</name>
<value>300</value>
<description>Time after which transactions are declared aborted if the client has not sent a heartbeat, in seconds.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.txn.max.open.batch</name>
<value>1000</value>
<description>Maximum number of transactions that can be fetched in one call to open_txns(). Increasing this will decrease the number of delta files created when streaming data into Hive. But it will also increase the number of open transactions at any given time, possibly impacting read performance.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.initiator.on</name>
<value>false</value>
@@ -254,8 +283,9 @@
<name>hive_txn_acid</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.worker.threads</name>
<value>0</value>
@@ -273,58 +303,67 @@
<name>hive_txn_acid</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.worker.timeout</name>
<value>86400L</value>
<description>Time, in seconds, before a given compaction in working state is declared a failure and returned to the initiated state.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.check.interval</name>
<value>300L</value>
<description>Time in seconds between checks to see if any partitions need compacted. This should be kept high because each check for compaction requires many calls against the NameNode.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.delta.num.threshold</name>
<value>10</value>
<description>Number of delta files that must exist in a directory before the compactor will attempt a minor compaction.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.delta.pct.threshold</name>
<value>0.1f</value>
<description>Percentage (by size) of base that deltas can be before major compaction is initiated.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.abortedtxn.threshold</name>
<value>1000</value>
<description>Number of aborted transactions involving a particular table or partition before major compaction is initiated.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>datanucleus.cache.level2.type</name>
<value>none</value>
<description>Determines caching mechanism DataNucleus L2 cache will use. It is strongly recommended to use default value of 'none' as other values may cause consistency errors in Hive.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.authentication.spnego.principal</name>
<value>HTTP/_HOST@EXAMPLE.COM</value>
<description>
This keytab would be used by HiveServer2 when Kerberos security is enabled and HTTP transport mode is used.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.authentication.spnego.keytab</name>
<value>/etc/security/keytabs/spnego.service.keytab</value>
<description>
The SPNEGO service principal would be used by HiveServer2 when Kerberos security is enabled and HTTP transport mode is used.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
index 54603d1..3f93008 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<!-- webhcat-env.cmd -->
<property>
@@ -30,5 +29,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-site.xml
index 7b95ed8..c2ac0e8 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/configuration/webhcat-site.xml
@@ -1,4 +1,4 @@
-\ufeff<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,53 +16,57 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- The default settings for Templeton. -->
<!-- Edit templeton-site.xml to change settings for your local -->
<!-- install. -->
-
<configuration supports_final="true">
-
<property>
<name>templeton.jar</name>
<value>c:\hdp\hive\hcatalog\share\webhcat\svr\lib\hive-webhcat.jar</value>
<description>The path to the Templeton jar file.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hcat</name>
<value>${env.HCAT_HOME}\bin\hcat.py</value>
<description>The path to the hcatalog executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hadoop</name>
<value>${env.HADOOP_HOME}\bin\hadoop.cmd</value>
<description>The path to the Hadoop executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.streaming.jar</name>
<value>file:///c:/hdp/hadoop/share/hadoop/tools/lib/hadoop-streaming.jar</value>
<description>The hdfs path to the Hadoop streaming jar file.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-
<property>
<name>templeton.libjars</name>
<value>file:///c:/hdp/hive/lib/zookeeper.jar</value>
<description>Jars to add to the classpath.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.pig.path</name>
<value>${env.PIG_HOME}/bin/pig.cmd</value>
<description>The path to the Pig executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hive.path</name>
<value>${env.HIVE_HOME}\bin\hive.cmd</value>
<description>The path to the Hive executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>