ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [46/50] [abbrv] ambari git commit: AMBARI-21431. Update BigInsight configuration files to be compliant with XSD
Date Tue, 11 Jul 2017 16:26:19 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-site.xml
index 12dfd8a..c786f98 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-site.xml
@@ -27,12 +27,14 @@ limitations under the License.
     <name>templeton.port</name>
     <value>50111</value>
     <description>The HTTP port for the main server.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.hadoop.conf.dir</name>
     <value>/etc/hadoop/conf</value>
     <description>The path to the Hadoop configuration.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -40,6 +42,7 @@ limitations under the License.
     <!-- TODO VERIFY WITH STACK-SELECT value>/usr/lib/hcatalog/share/webhcat/svr/webhcat.jar</value -->
     <value>/usr/iop/current/hive-webhcat/share/webhcat/svr/lib/hive-webhcat-*.jar</value>
     <description>The path to the Templeton jar file.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -47,6 +50,7 @@ limitations under the License.
     <!-- TODO VERIFY WITH STACK-SELECT value>/usr/lib/zookeeper/zookeeper.jar</value-->
     <value>/usr/iop/current/zookeeper-client/zookeeper.jar</value>
     <description>Jars to add the the classpath.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -54,12 +58,14 @@ limitations under the License.
     <!-- TODO VERIFY WITH STACK-SELECT value>/usr/bin/hadoop</value-->
     <value>/usr/iop/current/hadoop-client/bin/hadoop</value>
     <description>The path to the Hadoop executable.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.pig.archive</name>
     <value>hdfs:///iop/apps/${iop.version}/pig/pig.tar.gz</value>
     <description>The path to the Pig archive in HDFS.</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
@@ -69,6 +75,7 @@ limitations under the License.
     <name>templeton.pig.path</name>
     <value>pig.tar.gz/pig/bin/pig</value>
     <description>The path to the Pig executable.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -76,12 +83,14 @@ limitations under the License.
     <!-- TODO VERIFY WITH STACK-SELECT value>/usr/bin/hcat</value -->
     <value>/usr/iop/current/hive-client/bin/hcat</value>
     <description>The path to the hcatalog executable.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.hive.archive</name>
     <value>hdfs:///iop/apps/${iop.version}/hive/hive.tar.gz</value>
     <description>The path to the Hive archive.</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
@@ -91,36 +100,42 @@ limitations under the License.
     <name>templeton.hive.home</name>
     <value>hive.tar.gz/hive</value>
     <description>The path to the Hive home within the tar. Has no effect if templeton.hive.archive is not set.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.hcat.home</name>
     <value>hive.tar.gz/hive/hcatalog</value>
     <description>The path to the HCat home within the tar. Has no effect if templeton.hive.archive is not set.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.hive.path</name>
     <value>hive.tar.gz/hive/bin/hive</value>
     <description>The path to the Hive executable.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.hive.properties</name>
     <value>hive.metastore.local=false, hive.metastore.uris=thrift://localhost:9933, hive.metastore.sasl.enabled=false</value>
     <description>Properties to set when running hive.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
    <property>
     <name>templeton.sqoop.archive</name>
     <value>hdfs:///iop/apps/${iop.version}/sqoop/sqoop.tar.gz</value>
     <description>The path to the Sqoop archive in HDFS.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.sqoop.path</name>
     <value>sqoop.tar.gz/sqoop/bin/sqoop</value>
     <description>The path to the Sqoop executable.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -129,12 +144,14 @@ limitations under the License.
     <description>The path to the Sqoop home within the tar. Has no effect if
       templeton.sqoop.archive is not set.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.zookeeper.hosts</name>
     <value>localhost:2181</value>
     <description>ZooKeeper servers, as comma separated host:port pairs</description>
+    <on-ambari-upgrade add="false"/>
     <value-attributes>
       <type>multiLine</type>
     </value-attributes>
@@ -144,24 +161,28 @@ limitations under the License.
     <name>templeton.storage.class</name>
     <value>org.apache.hive.hcatalog.templeton.tool.ZooKeeperStorage</value>
     <description>The class to use as storage</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.override.enabled</name>
     <value>false</value>
     <description>Enable the override path in templeton.override.jars</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.streaming.jar</name>
     <value>hdfs:///iop/apps/${iop.version}/mapreduce/hadoop-streaming.jar</value>
     <description>The hdfs path to the Hadoop streaming jar file.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>templeton.exec.timeout</name>
     <value>60000</value>
     <description>Time out for templeton api</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-broker.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-broker.xml
index 095f634..8ee6ab5 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-broker.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-broker.xml
@@ -28,6 +28,7 @@
       A comma-separated list of one or more directories in which Kafka data is stored.
       Each new partition that is created will be placed in the directory which currently has the fewest partitions.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directories</type>
     </value-attributes>
@@ -38,6 +39,7 @@
     <description>
       The port on which the server accepts client connections.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -52,6 +54,7 @@
       path /chroot/path. Note that you must create this path yourself prior to starting the broker and consumers must use the
       same connection string.
     </description>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>message.max.bytes</name>
@@ -61,6 +64,7 @@
       It is important that this property be in sync with the maximum fetch size your consumers use or
       else an unruly producer will be able to publish messages too large for consumers to consume.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>num.network.threads</name>
@@ -69,6 +73,7 @@
       The number of network threads that the server uses for handling network requests.
       You probably don't need to change this.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>num.io.threads</name>
@@ -76,11 +81,13 @@
     <description>
       The number of I/O threads that the server uses for executing requests. You should have at least as many threads as you have disks.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>queued.max.requests</name>
     <value>500</value>
     <description>The number of requests that can be queued up for processing by the I/O threads before the network threads stop reading in new requests.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>socket.send.buffer.bytes</name>
@@ -88,6 +95,7 @@
     <description>
       The SO_SNDBUFF buffer the server prefers for socket connections.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>socket.receive.buffer.bytes</name>
@@ -95,6 +103,7 @@
     <description>
       The SO_RCVBUFF buffer the server prefers for socket connections.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>socket.request.max.bytes</name>
@@ -102,6 +111,7 @@
     <description>
       The maximum request size the server will allow. This prevents the server from running out of memory and should be smaller than the Java heap size.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>num.partitions</name>
@@ -109,6 +119,7 @@
     <description>
         The default number of partitions per topic.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>log.segment.bytes</name>
@@ -117,6 +128,7 @@
       The maximum request size the server will allow.
       This prevents the server from running out of memory and should be smaller than the Java heap size.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>log.roll.hours</name>
@@ -124,6 +136,7 @@
     <description>
       This setting will force Kafka to roll a new log segment even if the log.segment.bytes size has not been reached.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>log.retention.bytes</name>
@@ -131,6 +144,7 @@
     <description>
       The amount of data to retain in the log for each topic-partitions. Note that this is the limit per-partition so multiply by the number of partitions to get the total data retained for the topic. Also note that if both log.retention.hours and log.retention.bytes are both set we delete a segment when either limit is exceeded.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>log.retention.hours</name>
@@ -138,12 +152,14 @@
     <description>
       The number of hours to keep a log segment before it is deleted, i.e. the default data retention window for all topics. Note that if both log.retention.hours and log.retention.bytes are both set we delete a segment when either limit is exceeded.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>log.cleanup.interval.mins</name>
     <value>10</value>
     <description>The frequency in minutes that the log cleaner checks whether any log segment is eligible for deletion to meet the retention policies.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>log.index.size.max.bytes</name>
@@ -153,6 +169,7 @@
       sparse file with this much space and shrink it down when the log rolls. If the index fills up we will roll a new log segment
       even if we haven't reached the log.segment.bytes limit.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>log.index.interval.bytes</name>
@@ -160,6 +177,7 @@
     <description>
       The byte interval at which we add an entry to the offset index. When executing a fetch request the server must do a linear scan for up to this many bytes to find the correct position in the log to begin and end the fetch. So setting this value to be larger will mean larger index files (and a bit more memory usage) but less scanning. However the server will never add more than one index entry per log append (even if more than log.index.interval worth of messages are appended). In general you probably don't need to mess with this value.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -168,6 +186,7 @@
     <description>
       The frequency in ms that the log flusher checks whether any log is eligible to be flushed to disk.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>log.flush.interval.ms</name>
@@ -175,6 +194,7 @@
     <description>
       The maximum time between fsync calls on the log. If used in conjuction with log.flush.interval.messages the log will be flushed when either criteria is met.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>auto.create.topics.enable</name>
@@ -182,26 +202,31 @@
     <description>
       Enable auto creation of topic on the server. If this is set to true then attempts to produce, consume, or fetch metadata for a non-existent topic will automatically create it with the default replication factor and number of partitions.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>controller.socket.timeout.ms</name>
     <value>30000</value>
-    <property>The socket timeout for commands from the partition management controller to the replicas.</property>
+    <description>The socket timeout for commands from the partition management controller to the replicas.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>controller.message.queue.size</name>
     <value>10</value>
     <description>The buffer size for controller-to-broker-channels</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>default.replication.factor</name>
     <value>1</value>
     <description>The default replication factor for automatically created topics.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>replica.lag.time.max.ms</name>
     <value>10000</value>
     <description>If a follower hasn't sent any fetch requests for this window of time, the leader will remove the follower from ISR (in-sync replicas) and treat it as dead.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>replica.lag.max.messages</name>
@@ -209,32 +234,38 @@
     <description>
       If a replica falls more than this many messages behind the leader, the leader will remove the follower from ISR and treat it as dead.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>replica.socket.timeout.ms</name>
     <value>30000</value>
     <description>The socket timeout for network requests to the leader for replicating data.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>replica.socket.receive.buffer.bytes</name>
     <value>65536</value>
     <description>The socket receive buffer for network requests to the leader for replicating data.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>replica.fetch.max.bytes</name>
     <value>1048576</value>
     <description>The number of byes of messages to attempt to fetch for each partition in the fetch requests the replicas send to the leader.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>replica.fetch.wait.max.ms</name>
     <value>500</value>
     <description>The maximum amount of time to wait time for data to arrive on the leader in the fetch requests sent by the replicas to the leader.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>replica.fetch.min.bytes</name>
     <value>1</value>
     <description>Minimum bytes expected for each fetch response for the fetch requests from the replica to the leader. If not enough bytes, wait up to replica.fetch.wait.max.ms for this many bytes to arrive.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>num.replica.fetchers</name>
@@ -242,46 +273,55 @@
     <description>
       Number of threads used to replicate messages from leaders. Increasing this value can increase the degree of I/O parallelism in the follower broker.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>replica.high.watermark.checkpoint.interval.ms</name>
     <value>5000</value>
     <description>The frequency with which each replica saves its high watermark to disk to handle recovery.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>fetch.purgatory.purge.interval.requests</name>
     <value>10000</value>
     <description>The purge interval (in number of requests) of the fetch request purgatory.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>producer.purgatory.purge.interval.requests</name>
     <value>10000</value>
     <description>The purge interval (in number of requests) of the producer request purgatory.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>zookeeper.session.timeout.ms</name>
     <value>30000</value>
     <description>Zookeeper session timeout. If the server fails to heartbeat to zookeeper within this period of time it is considered dead. If you set this too low the server may be falsely considered dead; if you set it too high it may take too long to recognize a truly dead server.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>zookeeper.connection.timeout.ms</name>
     <value>6000</value>
     <description>The maximum amount of time that the client waits to establish a connection to zookeeper.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>zookeeper.sync.time.ms</name>
     <value>2000</value>
     <description>How far a ZK follower can be behind a ZK leader.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>controlled.shutdown.enable</name>
     <value>false</value>
     <description>Enable controlled shutdown of the broker. If enabled, the broker will move all leaders on it to some other brokers before shutting itself down. This reduces the unavailability window during shutdown.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>controlled.shutdown.max.retries</name>
     <value>3</value>
     <description>Number of retries to complete the controlled shutdown successfully before executing an unclean shutdown.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>controlled.shutdown.retry.backoff.ms</name>
@@ -289,6 +329,7 @@
     <description>
       Backoff time between shutdown retries.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>kafka.metrics.reporters</name>
@@ -296,66 +337,79 @@
     <description>
       kafka timeline metrics reporter
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>kafka.timeline.metrics.reporter.enabled</name>
     <value>true</value>
     <description>Kafka timeline metrics reporter enable</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>kafka.timeline.metrics.host</name>
     <value>{{metric_collector_host}}</value>
     <description>Timeline host</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>kafka.timeline.metrics.port</name>
     <value>{{metric_collector_port}}</value>
     <description>Timeline port</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>kafka.timeline.metrics.reporter.sendInterval</name>
     <value>5900</value>
     <description>Timeline metrics reporter send interval</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>kafka.timeline.metrics.maxRowCacheSize</name>
     <value>10000</value>
     <description>Timeline metrics reporter send interval</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>auto.leader.rebalance.enable</name>
     <value>true</value>
     <description>Enables auto leader balancing. A background thread checks and triggers leader balance if required at regular intervals</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>num.recovery.threads.per.data.dir</name>
     <value>1</value>
     <description>The number of threads per data directory to be used for log recovery at startup and flushing at shutdown</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>min.insync.replicas</name>
     <value>1</value>
     <description>define the minimum number of replicas in ISR needed to satisfy a produce request with required.acks=-1 (or all)</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>leader.imbalance.per.broker.percentage</name>
     <value>10</value>
     <description>The ratio of leader imbalance allowed per broker. The controller would trigger a leader balance if it goes above this value per broker. The value is specified in percentage.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>leader.imbalance.check.interval.seconds</name>
     <value>300</value>
     <description>The frequency with which the partition rebalance check is triggered by the controller</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offset.metadata.max.bytes</name>
     <value>4096</value>
     <description>The maximum size for a metadata entry associated with an offset commit</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.load.buffer.size</name>
     <value>5242880</value>
     <description>Batch size for reading from the offsets segments when loading offsets into the cache.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.topic.replication.factor</name>
@@ -364,51 +418,61 @@
     To ensure that the effective replication factor of the offsets topic is the configured value,
     the number of alive brokers has to be at least the replication factor at the time of the
     first request for the offsets topic. If not, either the offsets topic creation will fail or it will get a replication factor of min(alive brokers, configured replication factor).</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.topic.num.partitions</name>
     <value>50</value>
     <description>The number of partitions for the offset commit topic (should not change after deployment)</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.topic.segment.bytes</name>
     <value>104857600</value>
     <description>The offsets topic segment bytes should be kept relatively small in order to facilitate faster log compaction and cache loads</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.topic.compression.codec</name>
     <value>0</value>
     <description>Compression codec for the offsets topic - compression may be used to achieve \"atomic\" commits. Default is NoCompression. For Gzip add value 1 , SnappyCompression add value 2, LZ4CompressionCodec 3.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.retention.minutes</name>
     <value>86400000</value>
     <description>Log retention window in minutes for offsets topic</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.retention.check.interval.ms</name>
     <value>600000</value>
     <description>Frequency at which to check for stale offsets</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.commit.timeout.ms</name>
     <value>5000</value>
     <description>Offset commit will be delayed until all replicas for the offsets topic receive the commit or this timeout is reached. This is similar to the producer request timeout.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>offsets.commit.required.acks</name>
     <value>-1</value>
     <description>The required acks before the commit can be accepted. In general, the default (-1) should not be overridden</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>delete.topic.enable</name>
     <value>false</value>
     <description>Enables delete topic. Delete topic through the admin tool will have no effect if this config is turned off</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>compression.type</name>
     <description>Specify the final compression type for a given topic. This configuration accepts the standard compression codecs ('gzip', 'snappy', lz4). It additionally accepts 'uncompressed' which is equivalent to no compression; and 'producer' which means retain the original compression codec set by the producer.</description>
     <value>producer</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-env.xml
index 23576e9..8069f89 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-env.xml
@@ -24,6 +24,7 @@
   <property>
     <name>kafka_user</name>
     <value>kafka</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <description></description>
   </property>
@@ -31,12 +32,14 @@
     <name>kafka_log_dir</name>
     <value>/var/log/kafka</value>
     <description></description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>kafka_pid_dir</name>
     <display-name>Kafka PID dir</display-name>
     <value>/var/run/kafka</value>
     <description></description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <editable-only-at-install>true</editable-only-at-install>
@@ -65,5 +68,6 @@ if [ -e "/usr/lib/ambari-metrics-kafka-sink/ambari-metrics-kafka-sink.jar" ]; th
   export CLASSPATH=$CLASSPATH:/usr/lib/ambari-metrics-kafka-sink/lib/*
 fi
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-log4j.xml
index 901859e..155abf6 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KAFKA/configuration/kafka-log4j.xml
@@ -111,6 +111,7 @@ log4j.logger.state.change.logger=TRACE, stateChangeAppender
 log4j.additivity.state.change.logger=false
 
    </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/kerberos-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/kerberos-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/kerberos-env.xml
index 1a70ac0..9433ddb 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/kerberos-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/kerberos-env.xml
@@ -23,13 +23,12 @@
 <configuration supports_final="false">
   <property require-input="true">
     <name>kdc_type</name>
-    <display-name>KDC type</display-name>
     <value>mit-kdc</value>
     <description>
       The type of KDC being used. Either mit-kdc or active-directory
     </description>
-    <value>mit-kdc</value>
     <display-name>KDC type</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>componentHost</type>
       <overridable>false</overridable>
@@ -44,6 +43,7 @@
     </description>
     <value>true</value>
     <display-name>Manage Kerberos Identities</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <visible>false</visible>
       <overridable>false</overridable>
@@ -60,6 +60,7 @@
       compatible with MIT Kerberos 5 version 1.10.3 in command line options and behaviors.
     </description>
     <value>true</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>boolean</type>
       <overridable>false</overridable>
@@ -73,6 +74,7 @@
       The URL to the Active Directory LDAP Interface
     </description>
     <value/>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>host</type>
       <visible>false</visible>
@@ -86,6 +88,7 @@
     <description>
       The distinguished name (DN) of the container used store service principals
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <visible>false</visible>
       <overridable>false</overridable>
@@ -100,6 +103,7 @@
       The supported list of session key encryption types that should be returned by the KDC.
     </description>
     <value>aes des3-cbc-sha1 rc4 des-cbc-md5</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>multiLine</type>
       <overridable>false</overridable>
@@ -113,6 +117,7 @@
     </description>
     <display-name>Realm name</display-name>
     <value/>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>host</type>
       <editable-only-at-install>true</editable-only-at-install>
@@ -129,6 +134,7 @@
     </description>
     <display-name>KDC hosts</display-name>
     <value/>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -141,6 +147,7 @@
       The IP address or FQDN for the KDC Kerberos administrative host. Optionally a port number may be included.
     </description>
     <value/>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>host</type>
       <overridable>false</overridable>
@@ -154,6 +161,7 @@
       A comma-delimited list of search paths to use to find Kerberos utilities like kadmin and kinit.
     </description>
     <value>/usr/bin, /usr/kerberos/bin, /usr/sbin, /usr/lib/mit/bin, /usr/lib/mit/sbin</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
       <type>multiLine</type>
@@ -167,6 +175,7 @@
       The length required length for generated passwords.
     </description>
     <value>20</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -179,6 +188,7 @@
       The minimum number of lowercase letters (a-z) required in generated passwords
     </description>
     <value>1</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <overridable>false</overridable>
@@ -192,6 +202,7 @@
       The minimum number of uppercase letters (A-Z) required in generated passwords
     </description>
     <value>1</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <overridable>false</overridable>
@@ -205,6 +216,7 @@
       The minimum number of digits (0-9) required in generated passwords
     </description>
     <value>1</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <overridable>false</overridable>
@@ -218,6 +230,7 @@
       The minimum number of punctuation characters (?.!$%^*()-_+=~) required in generated passwords
     </description>
     <value>1</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <overridable>false</overridable>
@@ -231,6 +244,7 @@
       The minimum number of whitespace characters required in generated passwords
     </description>
     <value>0</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <overridable>false</overridable>
@@ -244,6 +258,7 @@
       The principal name to use when executing the Kerberos service check
     </description>
     <value>${cluster_name}-${short_date}</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -256,6 +271,7 @@
       Force principal names to resolve to lowercase local usernames in auth-to-local rules
     </description>
     <value>false</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
       <type>boolean</type>
@@ -286,6 +302,7 @@
   "userAccountControl": "66048"
 }
     </value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>content</type>
       <empty-value-valid>true</empty-value-valid>
@@ -300,6 +317,7 @@
       The set of attributes to use when creating a new Kerberos identity in the relevant (MIT) KDC.
     </description>
     <value/>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
       <overridable>false</overridable>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/krb5-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/krb5-conf.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/krb5-conf.xml
index ce5d4b4..1a163ec 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/krb5-conf.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KERBEROS/configuration/krb5-conf.xml
@@ -28,6 +28,7 @@
       A comma-separated list of domain names used to map server host names to the Realm name (e.g. .example.com,example.com). This is optional
     </description>
     <value/>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
       <overridable>false</overridable>
@@ -41,6 +42,7 @@
       Indicates whether your krb5.conf file should be managed by the wizard or should you manage it yourself
     </description>
     <value>true</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
       <type>boolean</type>
@@ -52,6 +54,7 @@
     <display-name>krb5-conf directory path</display-name>
     <description>The krb5.conf configuration directory</description>
     <value>/etc</value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -101,6 +104,7 @@
 
 {# Append additional realm declarations below #}
     </value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>content</type>
       <overridable>false</overridable>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-log4j.xml
index 370f786..f172c33 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-log4j.xml
@@ -79,5 +79,6 @@
     <description>
       content for log4j.properties file for Knox.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-site.xml
index 0e81d0a..a0b67d0 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/gateway-site.xml
@@ -27,42 +27,49 @@ limitations under the License.
         <name>gateway.port</name>
         <value>8443</value>
         <description>The HTTP port for the Gateway.</description>
+      <on-ambari-upgrade add="true"/>
     </property>
 
     <property>
         <name>gateway.path</name>
         <value>gateway</value>
         <description>The default context path for the gateway.</description>
+      <on-ambari-upgrade add="true"/>
     </property>
 
     <property>
         <name>gateway.gateway.conf.dir</name>
         <value>deployments</value>
         <description>The directory within GATEWAY_HOME that contains gateway topology files and deployments.</description>
+      <on-ambari-upgrade add="true"/>
     </property>
 
     <property>
         <name>gateway.hadoop.kerberos.secured</name>
         <value>false</value>
         <description>Boolean flag indicating whether the Hadoop cluster protected by Gateway is secured with Kerberos</description>
+      <on-ambari-upgrade add="true"/>
     </property>
 
     <property>
         <name>java.security.krb5.conf</name>
         <value>/etc/knox/conf/krb5.conf</value>
         <description>Absolute path to krb5.conf file</description>
+      <on-ambari-upgrade add="true"/>
     </property>
 
     <property>
         <name>java.security.auth.login.config</name>
         <value>/etc/knox/conf/krb5JAASLogin.conf</value>
         <description>Absolute path to JASS login config file</description>
+      <on-ambari-upgrade add="true"/>
     </property>
 
     <property>
         <name>sun.security.krb5.debug</name>
         <value>true</value>
         <description>Boolean flag indicating whether to enable debug messages for krb5 authentication</description>
+      <on-ambari-upgrade add="true"/>
     </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/knox-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/knox-env.xml
index 40504f6..a1faa9a 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/knox-env.xml
@@ -27,6 +27,7 @@
       <name>knox_master_secret</name>
       <display-name>Knox Master Secret</display-name>
       <value></value>
+      <on-ambari-upgrade add="true"/>
       <property-type>PASSWORD</property-type>
       <description>password to use as the master secret</description>
       <value-attributes>
@@ -38,6 +39,7 @@
     <property>
         <name>knox_user</name>
         <value>knox</value>
+        <on-ambari-upgrade add="true"/>
         <property-type>USER</property-type>
         <description>Knox Username.</description>
     </property>
@@ -45,6 +47,7 @@
     <property>
         <name>knox_group</name>
         <value>knox</value>
+        <on-ambari-upgrade add="true"/>
         <property-type>GROUP</property-type>
         <description>Knox Group.</description>
     </property>
@@ -54,6 +57,7 @@
       <display-name>Knox PID dir</display-name>
       <value>/var/run/knox</value>
       <description>Knox PID dir.</description>
+      <on-ambari-upgrade add="true"/>
       <value-attributes>
         <type>directory</type>
         <editable-only-at-install>true</editable-only-at-install>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/ldap-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/ldap-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/ldap-log4j.xml
index a0cf658..4bb4976 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/ldap-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/ldap-log4j.xml
@@ -62,5 +62,6 @@
     <description>
       content for log4j.properties file for the demo LDAP that comes with Knox.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/topology.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/topology.xml
index 162fffc..3fc428c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/topology.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/topology.xml
@@ -149,6 +149,7 @@
     <description>
         The configuration specifies the Hadoop cluster services Knox will provide access to.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
        <empty-value-valid>true</empty-value-valid>
        <show-property-name>false</show-property-name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/users-ldif.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/users-ldif.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/users-ldif.xml
index 6f6fa54..1e6e4d4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/users-ldif.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/KNOX/configuration/users-ldif.xml
@@ -131,6 +131,7 @@ member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
         <description>
             content for users-ldif file for the demo LDAP that comes with Knox.
         </description>
+        <on-ambari-upgrade add="true"/>
         <value-attributes>
           <show-property-name>false</show-property-name>
         </value-attributes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-env.xml
index f4b161e..b72e331 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-env.xml
@@ -25,6 +25,7 @@
     <name>oozie_user</name>
     <display-name>Oozie User</display-name>
     <value>oozie</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <description>Oozie User.</description>
   </property>
@@ -32,12 +33,14 @@
     <name>oozie_admin_users</name>
     <value>{oozie_user}, oozie-admin</value>
     <description>Oozie admin users.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie_database</name>
     <display-name>Oozie Database</display-name>
     <value>New Derby Database</value>
     <description>Oozie Server Database.</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -46,12 +49,14 @@
     <name>oozie_derby_database</name>
     <value>Derby</value>
     <description>Oozie Derby Database</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie_data_dir</name>
     <display-name>Oozie Data Dir</display-name>
     <value>/hadoop/oozie/data</value>
     <description>Data directory in which the Oozie DB exists</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <empty-value-valid>true</empty-value-valid>
@@ -63,6 +68,7 @@
     <display-name>Oozie Log Dir</display-name>
     <value>/var/log/oozie</value>
     <description>Directory for oozie logs</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <editable-only-at-install>true</editable-only-at-install>
@@ -74,6 +80,7 @@
     <display-name>Oozie PID Dir</display-name>
     <value>/var/run/oozie</value>
     <description>Directory in which the pid files for oozie reside.</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <editable-only-at-install>true</editable-only-at-install>
@@ -85,6 +92,7 @@
     <display-name>Oozie Server Admin Port</display-name>
     <value>11001</value>
     <description>The admin port Oozie server runs.</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
       <type>int</type>
@@ -94,16 +102,19 @@
     <name>oozie_initial_heapsize</name>
     <value>1024</value>
     <description>Oozie initial heap size.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie_heapsize</name>
     <value>2048</value>
     <description>Oozie heap size.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie_permsize</name>
     <value>256</value>
     <description>Oozie permanent generation size.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 
@@ -184,6 +195,7 @@ export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native
 export OOZIE_CLIENT_OPTS="${OOZIE_CLIENT_OPTS} -Doozie.connection.retry.count=5 "
 
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-log4j.xml
index 2ca87c3..38a7ef6 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-log4j.xml
@@ -141,6 +141,7 @@
       log4j.logger.org.hsqldb=WARN, oozie
       log4j.logger.org.apache.hadoop.security.authentication.server=WARN, oozie
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-site.xml
index 1cd7162..d194e3c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/configuration/oozie-site.xml
@@ -27,6 +27,7 @@
     <name>oozie.base.url</name>
     <value>http://localhost:11000/oozie</value>
     <description>Base Oozie URL.</description>
+    <on-ambari-upgrade add="false"/>
   </property>
 
   <property>
@@ -35,6 +36,7 @@
     <description>
       The Oozie system ID.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -43,6 +45,7 @@
     <description>
       System mode for Oozie at startup.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -52,6 +55,7 @@
       Specifies whether security (user name/admin role) is enabled or not.
       If disabled any user can manage Oozie system and manage any job.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -60,6 +64,7 @@
     <description>
       Jobs older than this value, in days, will be purged by the PurgeService.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -68,18 +73,21 @@
     <description>
       Interval at which the purge service will run, in seconds.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>oozie.service.CallableQueueService.queue.size</name>
     <value>1000</value>
     <description>Max callable queue size</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>oozie.service.CallableQueueService.threads</name>
     <value>10</value>
     <description>Number of threads used for executing callables</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -92,6 +100,7 @@
       All commands that use action executors (action-start, action-end, action-kill and action-check) use
       the action type as the callable type.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -100,6 +109,7 @@
     <description>Default timeout for a coordinator action input check (in minutes) for normal job.
       -1 means infinite timeout
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -110,6 +120,7 @@
       this check or submit coordinators with frequencies faster than 5 minutes: doing so can cause unintended behavior and
       additional system stress.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -119,6 +130,7 @@
     <description>
       Oozie DataBase Name
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>database</type>
       <overridable>false</overridable>
@@ -132,6 +144,7 @@
       Authentication used for Oozie HTTP endpoint, the supported values are: simple | kerberos |
       #AUTHENTICATION_HANDLER_CLASSNAME#.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -142,6 +155,7 @@
       This path is added to workflow application if their job properties sets
       the property 'oozie.use.system.libpath' to true.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -153,6 +167,7 @@
       specify where the Pig JAR files are. Instead, the ones from the system
       library path are used.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie.authentication.kerberos.name.rules</name>
@@ -164,6 +179,7 @@
       DEFAULT
     </value>
     <description>The mapping from kerberos principal names to local OS user names.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie.service.HadoopAccessorService.hadoop.configurations</name>
@@ -176,6 +192,7 @@
       the Oozie configuration directory; though the path can be absolute (i.e. to point
       to Hadoop client conf/ directories in the local filesystem.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie.service.ActionService.executor.ext.classes</name>
@@ -191,6 +208,7 @@
       be used in workflows. This property is a convenience property to add extensions to the built in executors without
       having to include all the built in ones.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -200,6 +218,7 @@
       Schemas for additional actions types. IMPORTANT: if there are no schemas leave a 1 space string, the service
       trims the value, if empty Configuration assumes it is NULL.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie.service.JPAService.create.db.schema</name>
@@ -210,6 +229,7 @@
       If set to true, it creates the DB schema if it does not exist. If the DB schema exists is a NOP.
       If set to false, it does not create the DB schema. If the DB schema does not exist it fails start up.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -219,6 +239,7 @@
     <description>
       JDBC driver class.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -231,6 +252,7 @@
     <description>
       JDBC URL.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -243,6 +265,7 @@
     <description>
       Database user name to use to connect to the database
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>db_user</type>
       <overridable>false</overridable>
@@ -260,6 +283,7 @@
       IMPORTANT: if password is empty leave a 1 space string, the service trims the value,
       if empty Configuration assumes it is NULL.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -271,6 +295,7 @@
     <description>
       Max number of connections.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -316,6 +341,7 @@
 	   All services to be created and managed by Oozie Services singleton.
       Class names must be separated by commas.
 	</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie.service.URIHandlerService.uri.handlers</name>
@@ -323,6 +349,7 @@
     <description>
       Enlist the different uri handlers supported for data availability checks.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie.services.ext</name>
@@ -332,6 +359,7 @@
       To add/replace services defined in 'oozie.services' with custom implementations.
       Class names must be separated by commas.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie.service.coord.push.check.requeue.interval</name>
@@ -339,6 +367,7 @@
     <description>
       Command re-queue interval for push dependencies (in millisecond).
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>oozie.credentials.credentialclasses</name>
@@ -346,11 +375,13 @@
     <description>
       Credential Class to be used for HCat.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>oozie.service.SchemaService.wf.ext.schemas</name>
     <value>shell-action-0.1.xsd,shell-action-0.2.xsd,shell-action-0.3.xsd,email-action-0.1.xsd,email-action-0.2.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,hive-action-0.4.xsd,hive-action-0.5.xsd,sqoop-action-0.2.xsd,sqoop-action-0.3.xsd,sqoop-action-0.4.xsd,ssh-action-0.1.xsd,ssh-action-0.2.xsd,distcp-action-0.1.xsd,distcp-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -360,6 +391,7 @@
       Specifies whether security (user name/admin role) is enabled or not.
       If disabled any user can manage Oozie system and manage any job.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -368,6 +400,7 @@
     <description>
       Indicates if Oozie is configured to use Kerberos.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -377,6 +410,7 @@
       Indicates if anonymous requests are allowed.
       This setting is meaningful only when using 'simple' authentication.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-env.xml
index 4cec418..8440f0f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-env.xml
@@ -33,6 +33,7 @@ HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
 #  PIG_OPTS="$PIG_OPTS -Dmapreduce.framework.name=yarn"
 #fi
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-log4j.xml
index 4f656f4..37cff5f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-log4j.xml
@@ -57,6 +57,7 @@ log4j.appender.A=org.apache.log4j.ConsoleAppender
 log4j.appender.A.layout=org.apache.log4j.PatternLayout
 log4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
     </value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <show-property-name>false</show-property-name>
     </value-attributes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-properties.xml
index ea0fab5..8bd2f5f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/PIG/configuration/pig-properties.xml
@@ -622,6 +622,7 @@ hcat.bin=/usr/local/hcat/bin/hcat
 
     </value>
     <description>Describe all the Pig agent configurations</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
       <show-property-name>false</show-property-name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-client.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-client.xml
index fdeceae..80a72d3 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-client.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-client.xml
@@ -26,6 +26,7 @@
       <name>slider.security.protocol.acl</name>
       <value>*</value>
       <description>When security is enabled, set appropriate acl. Default value means allow everyone.</description>
+      <on-ambari-upgrade add="true"/>
     </property>
     -->
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-env.xml
index d5bab25..0ecf8f4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-env.xml
@@ -38,6 +38,7 @@ export JAVA_HOME={{java64_home}}
 # The hadoop conf directory.  Optional as slider-client.xml can be edited to add properties.
 export HADOOP_CONF_DIR={{hadoop_conf_dir}}
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
-</configuration>
\ No newline at end of file
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-log4j.xml
index 709867c..cc28881 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SLIDER/configuration/slider-log4j.xml
@@ -84,6 +84,7 @@ log4j.logger.org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor=
 log4j.logger.org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdaterImpl=WARN
 log4j.logger.org.apache.zookeeper=WARN
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-env.xml
index 03e88c9..03d4e99 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-env.xml
@@ -4,6 +4,7 @@
    <property>
     <name>solr_user</name>
     <description>User to run Solr as</description>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <value>solr</value>
   </property>
@@ -12,28 +13,33 @@
     <name>solr_lib_dir</name>
     <value>/var/lib/solr</value>
     <description>Directory for writable Solr files and index data</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>solr_pid_dir</name>
     <value>/var/run/solr</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>solr_log_dir</name>
     <value>/var/log/solr</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>solr_port</name>
     <value>8983</value>
     <description>Sets the port Solr binds to, default is 8983</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>solr_hdfs_home_dir</name>
     <value>/apps/solr/data</value>
     <description>A root location in HDFS for Solr to write collection data to. Rather than specifying an HDFS location for the data directory or update log directory, use this to specify one root location and have everything automatically created within this HDFS</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 
@@ -42,6 +48,7 @@
     <value>/solr</value>
     <description>If you're using a ZooKeeper instance that is shared by other systems, it's recommended to isolate the SolrCloud znode tree using ZooKeeper's chroot support.
     For instance, to ensure all znodes created by SolrCloud are stored under /solr, you can put /solr on the end of your ZK_HOST connection string, such as: ZK_HOST=zk1,zk2,zk3/solr</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
  <property>
@@ -203,6 +210,7 @@ SOLR_OPTS="-Dsolr.directoryFactory=HdfsDirectoryFactory \
 -Dsolr.hdfs.security.kerberos.principal={{solr_principal}}"
 
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-log4j.xml
index abbf9d2..b2527f2 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-log4j.xml
@@ -77,6 +77,7 @@ log4j.logger.org.apache.hadoop=WARN
 # set to INFO to enable infostream log messages
 log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-site.xml
index e36e633..29d77c3 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SOLR/configuration/solr-site.xml
@@ -24,6 +24,7 @@
     <name>solr.hdfs.security.kerberos.enabled</name>
     <value>false</value>
     <description>Set to true to enable Kerberos authentication</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -32,6 +33,7 @@
     <description>A keytab file contains pairs of Kerberos principals and encrypted keys which allows for password-less authentication when Solr attempts to authenticate with secure Hadoop.
     This file will need to be present on all Solr servers at the same path provided in this parameter.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -39,6 +41,7 @@
     <value>solr/_HOST@EXAMPLE.COM</value>
     <description>The Kerberos principal that Solr should use to authenticate to secure Hadoop; the format of a typical Kerberos V5 principal is: primary/instance@realm
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-defaults.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-defaults.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-defaults.xml
index 30826f1..60aa1b1 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-defaults.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-defaults.xml
@@ -25,12 +25,14 @@
     <name>spark.eventLog.enabled</name>
     <value>true</value>
     <description>Whether to log Spark events, useful for reconstructing the Web UI after the application has finished.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>spark.eventLog.dir</name>
     <value>/iop/apps/4.1.0.0/spark/logs/history-server</value>
     <description>Base directory in which Spark events are logged, if spark.eventLog.enabled is true. Within this base directory, Spark creates a sub-directory for each application, and logs the events specific to the application in this directory. Users may want to set this to a unified location like an HDFS directory so history files can be read by the history server.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -41,6 +43,7 @@
       This is memory that accounts for things like VM overheads, interned strings,
       other native overheads, etc.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -51,6 +54,7 @@
       This is memory that accounts for things like VM overheads, interned strings,
       other native overheads, etc.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -60,6 +64,7 @@
       Set the number of times the ApplicationMaster waits for the the Spark master and then
       also the number of tries it waits for the SparkContext to be initialized.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -68,6 +73,7 @@
     <description>
       The interval in ms in which the Spark application master heartbeats into the YARN ResourceManager.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -76,6 +82,7 @@
     <description>
       The maximum number of executor failures before failing the application.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -84,6 +91,7 @@
     <description>
       The name of the YARN queue to which the application is submitted.
     </description>
+    <on-ambari-upgrade add="false"/>
   </property>
 
   <property>
@@ -92,6 +100,7 @@
     <description>
       The maximum number of threads to use in the application master for launching executor containers.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -101,6 +110,7 @@
       HDFS replication level for the files uploaded into HDFS for the application.
       These include things like the Spark jar, the app jar, and any distributed cache files/archives.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -110,6 +120,7 @@
       Set to true to preserve the staged files (Spark jar, app jar, distributed cache files) at the
       end of the job rather then delete them.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -118,6 +129,7 @@
     <description>
       The port to which the web interface of the History Server binds.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>spark.driver.extraJavaOptions</name>
@@ -128,6 +140,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -139,6 +152,7 @@
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -147,6 +161,7 @@
     <description>
       Kerberos principal name for the Spark History Server.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -155,5 +170,6 @@
     <description>
       Location of the kerberos keytab file for the Spark History Server.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-env.xml
index e0c8a01..f000892 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-env.xml
@@ -28,11 +28,13 @@
     <description>
       TCP port number to listen on, default 10002.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>spark_user</name>
     <value>spark</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <description>Spark User.</description>
   </property>
@@ -40,6 +42,7 @@
   <property>
     <name>spark_group</name>
     <value>spark</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>GROUP</property-type>
     <description>spark group</description>
   </property>
@@ -48,11 +51,13 @@
     <name>spark_log_dir</name>
     <value>/var/log/spark</value>
     <description>Spark Log Dir</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>spark_pid_dir</name>
     <value>/var/run/spark</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <!-- spark-env.sh -->
@@ -105,6 +110,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-{{hadoop_conf_dir}}}
 export JAVA_HOME={{java_home}}
 
 </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-javaopts-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-javaopts-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-javaopts-properties.xml
index c2db325..a197e34 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-javaopts-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-javaopts-properties.xml
@@ -23,5 +23,6 @@
     <name>content</name>
     <description>Spark-javaopts-properties</description>
     <value> </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-log4j.xml
index 2ba64fb..9185a85 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-log4j.xml
@@ -38,5 +38,6 @@ log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
 log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
 
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-metrics-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-metrics-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-metrics-properties.xml
index 9af5f2e..0de0cf5 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-metrics-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/configuration/spark-metrics-properties.xml
@@ -156,5 +156,6 @@
 #executor.source.jvm.class=org.apache.spark.metrics.source.JvmSource
 
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SQOOP/configuration/sqoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SQOOP/configuration/sqoop-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SQOOP/configuration/sqoop-env.xml
index eb9da7b..d9070c2 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SQOOP/configuration/sqoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SQOOP/configuration/sqoop-env.xml
@@ -44,10 +44,12 @@ export ZOOCFGDIR=${ZOOCFGDIR:-/etc/zookeeper/conf}
 # add libthrift in hive to sqoop class path first so hive imports work
 export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`:${SQOOP_USER_CLASSPATH}"
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>sqoop_user</name>
     <description>User to run Sqoop as</description>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <value>sqoop</value>
   </property>
@@ -55,5 +57,6 @@ export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`:
     <name>jdbc_drivers</name>
     <description>Comma separated list of additional JDBC drivers class names</description>
     <value> </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-env.xml
index 11676d9..3926fec 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-env.xml
@@ -26,6 +26,7 @@
     <display-name>Mapreduce Log Dir Prefix</display-name>
     <value>/var/log/hadoop-mapreduce</value>
     <description>Mapreduce Log Dir Prefix</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -37,6 +38,7 @@
     <display-name>Mapreduce PID Dir Prefix</display-name>
     <value>/var/run/hadoop-mapreduce</value>
     <description>Mapreduce PID Dir Prefix</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -46,6 +48,7 @@
   <property>
     <name>mapred_user</name>
     <value>mapred</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <description>Mapreduce User</description>
   </property>
@@ -54,6 +57,7 @@
     <display-name>History Server heap size</display-name>
     <value>900</value>
     <description>Value for JobHistoryServer heap_size variable in hadoop-env.sh</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <unit>MB</unit>
       <type>int</type>
@@ -78,5 +82,6 @@ export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA
 #export HADOOP_MAPRED_IDENT_STRING= #A string representing this instance of hadoop. $USER by default
 #export HADOOP_MAPRED_NICENESS= #The scheduling priority for daemons. Defaults to 0.
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>


Mime
View raw message