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/07/05 16:31:23 UTC
ambari git commit: AMBARI-17564. Identify config changes added to
Ambari-2.4.0 and mark them to not get added during Ambari upgrade
(dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk f0fec408b -> 92f12dd31
AMBARI-17564. Identify config changes added to Ambari-2.4.0 and mark them to not get added during Ambari upgrade (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92f12dd3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92f12dd3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92f12dd3
Branch: refs/heads/trunk
Commit: 92f12dd3143641c444ddda774901b8bdd94ac56a
Parents: f0fec40
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Jul 5 18:35:52 2016 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Jul 5 19:30:52 2016 +0300
----------------------------------------------------------------------
.../0.1.0/configuration/ams-hbase-env.xml | 2 +-
.../0.1.0/configuration/ams-site.xml | 10 +++----
.../configuration/application-properties.xml | 22 +++++++-------
.../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 2 +-
.../HAWQ/2.0.0/configuration/hawq-site.xml | 30 ++++++++++----------
.../2.0.0/configuration/hawq-sysctl-env.xml | 2 +-
.../0.96.0.2.0/configuration/hbase-env.xml | 2 +-
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 2 +-
.../0.12.0.2.0/configuration/webhcat-site.xml | 2 +-
.../1.10.3-10/configuration/kerberos-env.xml | 8 +++---
.../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 2 +-
.../TEZ/0.4.0.2.1/configuration/tez-site.xml | 2 +-
.../configuration-mapred/mapred-site.xml | 4 +--
.../YARN/2.1.0.2.0/configuration/yarn-env.xml | 2 +-
.../HDP/2.0.6/configuration/cluster-env.xml | 26 ++++++++---------
.../services/YARN/configuration/yarn-site.xml | 2 +-
.../services/STORM/configuration/storm-site.xml | 8 +++---
.../services/OOZIE/configuration/oozie-site.xml | 2 +-
18 files changed, 65 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index b4eecec..eb63c9f 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -173,7 +173,7 @@ The timeout is introduced because there is a known bug when from time to time HB
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<!-- hbase-env.sh -->
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index 871e571..50b95fd 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
@@ -665,7 +665,7 @@
Skip block cache on aggregator queries to allow, HBase block
utilization only for user queries.
</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>timeline.metrics.cache.commit.interval</name>
@@ -677,7 +677,7 @@
<type>int</type>
<unit>s</unit>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>timeline.metrics.cache.size</name>
@@ -689,7 +689,7 @@
<type>int</type>
<unit>Bytes</unit>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>timeline.metrics.cache.enabled</name>
@@ -697,7 +697,7 @@
<description>
If set to true PhoenixHBaseAccessor will use cache to store metrics before committing them
</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>timeline.metrics.service.http.policy</name>
@@ -734,6 +734,6 @@
Commas separated list of regular expressions that match metric names
which prevents certain metrics from ending up in metadata cache.
</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
index 3578d43..31b7d6b 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
@@ -156,13 +156,13 @@
<name>atlas.notification.embedded</name>
<value>false</value>
<description>Indicates whether or not the notification service should be embedded.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.cluster.name</name>
<value>{{cluster_name}}</value>
<description>The cluster name.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.server.http.port</name>
@@ -180,55 +180,55 @@
<name>atlas.http.authentication.type</name>
<value>simple</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.hook.falcon.synchronous</name>
<value>false</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.hook.falcon.numRetries</name>
<value>3</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.hook.falcon.minThreads</name>
<value>5</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.hook.falcon.maxThreads</name>
<value>5</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.hook.falcon.keepAliveTime</name>
<value>10</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.hook.falcon.queueSize</name>
<value>1000</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.audit.hbase.tablename</name>
<value>ATLAS_ENTITY_AUDIT_EVENTS</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>atlas.audit.zookeeper.session.timeout.ms</name>
<value>1000</value>
<description/>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<!-- The type determines whether to show LDAP or AD settings in smart config's theme.json file. -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
index b8f7715..e4eae65 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
@@ -77,7 +77,7 @@
<overridable>false</overridable>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<!-- metadata-env.sh -->
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 150b2c6..017e09b 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -374,7 +374,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>gp_workfile_limit_files_per_query</name>
@@ -389,7 +389,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>gp_workfile_limit_per_query</name>
@@ -404,7 +404,7 @@
<minimum>0</minimum>
<unit>kB</unit>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>gp_workfile_limit_per_segment</name>
@@ -419,7 +419,7 @@
<minimum>0</minimum>
<unit>kB</unit>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>gp_autostats_mode</name>
@@ -446,7 +446,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>gp_autostats_on_change_threshold</name>
@@ -459,7 +459,7 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>gp_external_max_segs</name>
@@ -471,7 +471,7 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>hawq_rm_resource_idle_timeout</name>
@@ -484,7 +484,7 @@
<minimum>-1</minimum>
<maximum>65535</maximum>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>log_duration</name>
@@ -495,7 +495,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>log_rotation_age</name>
@@ -507,7 +507,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>log_statement</name>
@@ -536,7 +536,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>log_statement_stats</name>
@@ -548,7 +548,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>log_truncate_on_rotation</name>
@@ -562,7 +562,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>runaway_detector_activation_percent</name>
@@ -577,7 +577,7 @@
<minimum>0</minimum>
<maximum>100</maximum>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>statement_timeout</name>
@@ -588,6 +588,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
index 290239e..d0175b2 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
@@ -355,6 +355,6 @@
<maximum>200</maximum>
<increment-step>25</increment-step>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index 9811191..24bd563 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -152,7 +152,7 @@ The timeout is introduced because there is a known bug when from time to time HB
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<!-- hbase-env.sh -->
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index 61437d5..003b8ec 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -212,7 +212,7 @@ limitations under the License.
<name>hive.server2.max.start.attempts</name>
<description>This number of times HiveServer2 will attempt to start before exiting, sleeping 60 seconds between retries.</description>
<value>5</value>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>hive.server2.authentication</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
index d8012dd..cc5de73 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
@@ -155,6 +155,6 @@ limitations under the License.
<name>yarn.scheduler.capacity.root.queues</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index 29c46e9..3e274a1 100644
--- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -316,7 +316,7 @@
<overridable>false</overridable>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>kdc_create_attributes</name>
@@ -342,7 +342,7 @@
<empty-value-valid>true</empty-value-valid>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>set_password_expiry</name>
@@ -359,7 +359,7 @@
<overridable>false</overridable>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>password_chat_timeout</name>
@@ -374,6 +374,6 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index d0e51eb..804c662 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -80,7 +80,7 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>oozie_pid_dir</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
index e7a851c..a39583c 100644
--- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
+++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml
@@ -243,6 +243,6 @@
<name>yarn.scheduler.capacity.root.queues</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
index 6951db0..9253054 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
@@ -462,7 +462,7 @@
The following values are supported: - HTTP_ONLY : Service is provided only
on http - HTTPS_ONLY : Service is provided only on https
</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>mapreduce.job.queuename</name>
@@ -476,6 +476,6 @@
<name>yarn.scheduler.capacity.root.queues</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
index 152c463..c3bbcb6 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
@@ -255,6 +255,6 @@ YARN_OPTS="$YARN_OPTS -Djava.io.tmpdir={{hadoop_java_io_tmpdir}}"
<name>yarn.scheduler.capacity.root.queues</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index 89e05d7..9092bd4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -24,37 +24,37 @@
<name>recovery_enabled</name>
<value>true</value>
<description>Auto start enabled or not for this cluster.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>recovery_type</name>
<value>AUTO_START</value>
<description>Auto start type.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>recovery_lifetime_max_count</name>
<value>1024</value>
<description>Auto start lifetime maximum count of recovery attempt allowed per host component. This is reset when agent is restarted.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>recovery_max_count</name>
<value>6</value>
<description>Auto start maximum count of recovery attempt allowed per host component in a window. This is reset when agent is restarted.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>recovery_window_in_minutes</name>
<value>60</value>
<description>Auto start recovery window size in minutes.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>recovery_retry_interval</name>
<value>5</value>
<description>Auto start recovery retry gap between tries per host component.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>security_enabled</name>
@@ -177,7 +177,7 @@ gpgcheck=0</value>
<overridable>false</overridable>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<!-- Define stack_features property in the base stack. DO NOT override this property for each stack version -->
<property>
@@ -192,7 +192,7 @@ gpgcheck=0</value>
<overridable>false</overridable>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>stack_root</name>
@@ -203,30 +203,30 @@ gpgcheck=0</value>
<overridable>false</overridable>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>alerts_repeat_tolerance</name>
<value>1</value>
<description>The number of consecutive alerts required to transition an alert from the SOFT to the HARD state.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>ignore_bad_mounts</name>
<value>false</value>
<description>For properties handled by handle_mounted_dirs this will make Ambari not to create any directories.</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>create_dirs_on_root</name>
<value>true</value>
<description>For properties handled by handle_mounted_dirs this will make Ambari to create not-existent unknown directories on / partition</description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>one_dir_per_partition</name>
<value>true</value>
<description>For properties handled by handle_mounted_dirs this will make Ambari </description>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
index e1aab8a..2120e4b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
@@ -229,7 +229,7 @@
<name>yarn_cgroups_enabled</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
index f3bbce8..58675cc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
@@ -25,7 +25,7 @@
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"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>nimbus.childopts</name>
@@ -34,7 +34,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>worker.childopts</name>
@@ -43,7 +43,7 @@
<value-attributes>
<type>multiLine</type>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>supervisor.childopts</name>
@@ -52,6 +52,6 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92f12dd3/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-site.xml
index f2c41c3..845b951 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/OOZIE/configuration/oozie-site.xml
@@ -66,7 +66,7 @@
<name>oozie_database</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true"/>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>oozie.service.HadoopAccessorService.hadoop.configurations</name>