http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
index 096011c..0432ffa 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
@@ -29,6 +29,7 @@
       HBase to either local filesystem path if using Ambari Metrics in 
embedded mode or
       to a HDFS dir, example: hdfs://namenode.example.org:8020/amshbase.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.tmp.dir</name>
@@ -39,12 +40,14 @@
       than '/tmp' (The '/tmp' directory is often cleared on
       machine restart).
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.local.dir</name>
     <value>${hbase.tmp.dir}/local</value>
     <description>Directory on the local filesystem to be used as a local 
storage
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.cluster.distributed</name>
@@ -54,6 +57,7 @@
       standalone mode and true for distributed mode. If false, startup will run
       all HBase and ZooKeeper daemons together in the one JVM.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.wait.on.regionservers.mintostart</name>
@@ -61,6 +65,7 @@
     <description>
       Ensure that HBase Master waits for # many region server to start.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.zookeeper.quorum</name>
@@ -73,31 +78,37 @@
       this is the list of servers which we will start/stop ZooKeeper on.
     </description>
     <final>true</final>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.info.bindAddress</name>
     <value>0.0.0.0</value>
     <description>The bind address for the HBase Master web UI</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.info.port</name>
     <value>61310</value>
     <description>The port for the HBase Master web UI.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.info.port</name>
     <value>61330</value>
     <description>The port for the HBase RegionServer web UI.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.port</name>
     <value>61300</value>
     <description>The port for the HBase Master web UI.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.port</name>
     <value>61320</value>
     <description>The port for the HBase RegionServer web UI.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.hregion.majorcompaction</name>
@@ -107,6 +118,7 @@
       HStoreFiles in a region.
       0 to disable automated major compactions.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.query.spoolThresholdBytes</name>
@@ -115,6 +127,7 @@
       Threshold size in bytes after which results from parallelly executed
       query results are spooled to disk. Default is 20 mb.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.zookeeper.property.dataDir</name>
@@ -123,6 +136,7 @@
       Property from ZooKeeper's config zoo.cfg.
       The directory where the snapshot is stored.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.client.scanner.caching</name>
@@ -131,17 +145,20 @@
       Number of rows that will be fetched when calling next on a scanner
       if it is not served from (local, client) memory.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.normalizer.enabled</name>
     <value>true</value>
     <description>If set to true, Master will try to keep region size
     within each table approximately the same.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.normalizer.period</name>
     <value>600000</value>
     <description>Period in ms at which the region normalizer runs in the 
Master.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.normalizer.class</name>
@@ -151,6 +168,7 @@
       See the class comment for more on how it works
       
http://hbase.apache.org/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hfile.block.cache.size</name>
@@ -159,6 +177,7 @@
       Percentage of maximum heap (-Xmx setting) to allocate to block cache
       used by a StoreFile. Default of 0.4 means allocate 40%.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -167,6 +186,7 @@
       Maximum size of all memstores in a region server before new
       updates are blocked and flushes are forced. Defaults to 40% of heap
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.global.memstore.lowerLimit</name>
@@ -178,6 +198,7 @@
       the minimum possible flushing to occur when updates are blocked due to
       memstore limiting.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.groupby.maxCacheSize</name>
@@ -185,6 +206,7 @@
     <description>
       Size in bytes of pages cached during GROUP BY spilling. Default is 100Mb.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.hregion.max.filesize</name>
@@ -193,6 +215,7 @@
       Maximum HFile size. If the sum of the sizes of a region’s HFiles has 
grown
       to exceed this value, the region is split in two. Default is 10Gb.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.hregion.memstore.block.multiplier</name>
@@ -202,6 +225,7 @@
       times hbase.hregion.memstore.flush.size bytes. Useful preventing runaway
       memstore during spikes in update traffic.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.hstore.flusher.count</name>
@@ -211,6 +235,7 @@
       will be queued. With more threads, the flushes will be executed in 
parallel,
       increasing the load on HDFS, and potentially causing more compactions.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.query.timeoutMs</name>
@@ -219,6 +244,7 @@
       Number of milliseconds after which a query will timeout on the client.
       Default is 10 min.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.client.scanner.timeout.period</name>
@@ -226,6 +252,7 @@
     <description>
       Client scanner lease period in milliseconds.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.thread.compaction.large</name>
@@ -233,6 +260,7 @@
     <description>
       Configuration key for the large compaction threads.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.thread.compaction.small</name>
@@ -240,18 +268,22 @@
     <description>
       Configuration key for the small compaction threads.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.zookeeper.property.clientPort</name>
     <value>61181</value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.zookeeper.peerport</name>
     <value>61288</value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.zookeeper.leaderport</name>
     <value>61388</value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.hstore.blockingStoreFiles</name>
@@ -262,6 +294,7 @@
       this region until a compaction is completed, or until
       hbase.hstore.blockingWaitTime has been exceeded.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.hregion.memstore.flush.size</name>
@@ -271,25 +304,30 @@
       number of bytes. Value is checked by a thread that runs every
       hbase.server.thread.wakefrequency.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.query.spoolThresholdBytes</name>
     <value>12582912</value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.snapshot.enabled</name>
     <value>false</value>
     <description>Enable/Disable HBase snapshots.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.replication</name>
     <value>false</value>
     <description>Enable/Disable HBase replication.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>zookeeper.session.timeout</name>
     <value>120000</value>
     <description>ZooKeeper session timeout in milliseconds.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>zookeeper.session.timeout.localHBaseCluster</name>
@@ -298,6 +336,7 @@
       ZooKeeper session timeout in milliseconds for
       pseudo distributed mode.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.sequence.saltBuckets</name>
@@ -305,6 +344,7 @@
     <description>
       Controls the number of pre-allocated regions for SYSTEM.SEQUENCE table.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.query.maxGlobalMemoryPercentage</name>
@@ -313,6 +353,7 @@
       Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory())
       that all threads may use.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.spool.directory</name>
@@ -321,6 +362,7 @@
       Set directory for Phoenix spill files. If possible set this to a
       different mount point from the one for hbase.rootdir in embedded mode.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.mutate.batchSize</name>
@@ -330,6 +372,7 @@
       during the execution of an UPSERT SELECT or DELETE statement.
       This affects performance of group by aggregators if they are being used.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.query.rowKeyOrderSaltedTable</name>
@@ -340,6 +383,7 @@
       When this property is turned on, the salted table would behave just like
       a normal table and would return items in rowkey order for scans
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.coprocessor.maxServerCacheTimeToLiveMs</name>
@@ -352,6 +396,7 @@
       “Earlier hash cache(s) might have expired on servers” might also be a
       sign that this number should be increased.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.coprocessor.maxMetaDataCacheSize</name>
@@ -361,6 +406,7 @@
       evictions will begin to occur based on least recent access time.
       Default is 20Mb
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>dfs.client.read.shortcircuit</name>
@@ -369,6 +415,7 @@
       Hadoop servers should be configured to allow short circuit read
       for the hbase user for this to take effect
     </description>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>ams-hbase-site</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
index 13694d7..3735e6c 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-log4j.xml
@@ -57,6 +57,7 @@ log4j.appender.file.MaxBackupIndex=60
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %p %c: %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.2/services/AMBARI_METRICS/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-site.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-site.xml
index b7d0901..0a25a9f 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-site.xml
@@ -30,6 +30,7 @@
       1) embedded: Metrics stored on local FS, HBase in Standalone mode
       2) distributed: HBase daemons writing to HDFS
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.service.webapp.address</name>
@@ -37,6 +38,7 @@
     <description>
       The address of the metrics service web application.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.service.rpc.address</name>
@@ -44,6 +46,7 @@
     <description>
       The address of the metrics service rpc listeners.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.aggregator.checkpoint.dir</name>
@@ -53,6 +56,7 @@
       Directory to store aggregator checkpoints. Change to a permanent
       location so that checkpoint ar not lost.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
     </value-attributes>
@@ -65,6 +69,7 @@
       Time in seconds to sleep for the minute resolution host based
       aggregator. Default resolution is 5 minutes.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -77,6 +82,7 @@
       Time in seconds to sleep for the hourly resolution host based
       aggregator. Default resolution is 1 hour.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -88,6 +94,7 @@
       Time in seconds to sleep for the day resolution host based
       aggregator. Default resolution is 24 hours.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.hourly.interval</name>
@@ -97,6 +104,7 @@
       Time in seconds to sleep for the hourly resolution cluster wide
       aggregator. Default is 1 hour.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -108,6 +116,7 @@
       Time in seconds to sleep for the day resolution cluster wide
       aggregator. Default is 24 hours.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.minute.interval</name>
@@ -117,6 +126,7 @@
       Time in seconds to sleep for the minute resolution cluster wide
       aggregator. Default resolution is 5 minutes.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -129,6 +139,7 @@
       Time in seconds to sleep for the second resolution cluster wide
       aggregator. Default resolution is 2 minutes.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -141,6 +152,7 @@
       if aggregator checkpoint is greater than max allowed checkpoint delay,
       the checkpoint will be discarded by the aggregator.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     
<name>timeline.metrics.host.aggregator.hourly.checkpointCutOffMultiplier</name>
@@ -151,6 +163,7 @@
       if aggregator checkpoint is greater than max allowed checkpoint delay,
       the checkpoint will be discarded by the aggregator.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -164,6 +177,7 @@
       if aggregator checkpoint is greater than max allowed checkpoint delay,
       the checkpoint will be discarded by the aggregator.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -177,6 +191,7 @@
       if aggregator checkpoint is greater than max allowed checkpoint delay,
       the checkpoint will be discarded by the aggregator.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -190,6 +205,7 @@
       if aggregator checkpoint is greater than max allowed checkpoint delay,
       the checkpoint will be discarded by the aggregator.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -203,6 +219,7 @@
       if aggregator checkpoint is greater than max allowed checkpoint delay,
       the checkpoint will be discarded by the aggregator.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -215,6 +232,7 @@
       if aggregator checkpoint is greater than max allowed checkpoint delay,
       the checkpoint will be discarded by the aggregator.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.host.aggregator.daily.disabled</name>
@@ -222,6 +240,7 @@
     <description>
       Disable host based daily aggregations.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.host.aggregator.hourly.disabled</name>
@@ -230,6 +249,7 @@
     <description>
       Disable host based hourly aggregations.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.host.aggregator.minute.disabled</name>
@@ -238,6 +258,7 @@
     <description>
       Disable host based minute aggregations.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.daily.disabled</name>
@@ -245,6 +266,7 @@
     <description>
       Disable cluster based daily aggregations.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.hourly.disabled</name>
@@ -253,6 +275,7 @@
     <description>
       Disable cluster based hourly aggregations.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.minute.disabled</name>
@@ -261,6 +284,7 @@
     <description>
       Disable cluster based minute aggregations.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.second.disabled</name>
@@ -269,6 +293,7 @@
     <description>
       Disable cluster based second aggregations.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.second.timeslice.interval</name>
@@ -277,6 +302,7 @@
     <description>
       Lowest resolution of desired data for cluster level second aggregates.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -287,6 +313,7 @@
     <description>
       Host based daily resolution data purge interval. Default is 1 year.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.host.aggregator.hourly.ttl</name>
@@ -294,6 +321,7 @@
     <description>
       Host based hourly resolution data purge interval. Default is 30 days.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.host.aggregator.minute.ttl</name>
@@ -301,6 +329,7 @@
     <description>
       Host based minute resolution data purge interval. Default is 7 days.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.second.ttl</name>
@@ -308,6 +337,7 @@
     <description>
       Cluster wide second resolution data purge interval. Default is 7 days.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.minute.ttl</name>
@@ -315,6 +345,7 @@
     <description>
       Cluster wide minute resolution data purge interval. Default is 30 days.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.hourly.ttl</name>
@@ -322,6 +353,7 @@
     <description>
       Cluster wide hourly resolution data purge interval. Default is 1 year.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.cluster.aggregator.daily.ttl</name>
@@ -329,6 +361,7 @@
     <description>
       Cluster wide daily resolution data purge interval. Default is 2 years.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.host.aggregator.ttl</name>
@@ -336,6 +369,7 @@
     <description>
       1 minute resolution data purge interval. Default is 1 day.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.hbase.data.block.encoding</name>
@@ -345,6 +379,7 @@
       Default encoding is FAST_DIFF. This can be changed only before creating
       tables.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.hbase.compression.scheme</name>
@@ -354,6 +389,7 @@
       scheme. Default compression is SNAPPY. Disable by setting to None.
       This can be changed only before creating tables.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.service.default.result.limit</name>
@@ -363,6 +399,7 @@
       22 aggregate metrics/min * 2 * 60 * 6 : Retrieve 10 SECOND data for 2 
hours.
     </description>
     <display-name>Metrics service default result limit</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -375,6 +412,7 @@
       Time in seconds to sleep on the first run or when the checkpoint is
       too old.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -386,6 +424,7 @@
     <description>
       JDBC resultset prefect size for aggregator queries.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -398,6 +437,7 @@
       Percentage of total heap memory (i.e. Runtime.getRuntime().maxMemory())
       that all threads may use.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>phoenix.spool.directory</name>
@@ -406,6 +446,7 @@
       Set directory for Phoenix spill files. If possible set this to a
       different mount point from the one for hbase.rootdir in embedded mode.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.service.cluster.aggregator.appIds</name>
@@ -414,6 +455,7 @@
       List of application ids to use for aggregating host level metrics for
       an application. Example: bytes_read across Yarn Nodemanagers.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.service.use.groupBy.aggregators</name>
@@ -422,6 +464,7 @@
       Use a groupBy aggregated query to perform host level aggregations vs
       in-memory aggregations.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.host.aggregate.splitpoints</name>
@@ -430,6 +473,7 @@
       Pre-split regions using the split points corresponding to this property
       for the precision table that stores seconds aggregate data.
     </description>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>ams-hbase-site</type>
@@ -456,6 +500,7 @@
       Pre-split regions using the split points corresponding to this property
       for the aggregate table that stores seconds aggregate data across hosts.
     </description>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>ams-hbase-site</type>
@@ -483,6 +528,7 @@
       Time in seconds to sleep before report metrics to collector.
       Default resolution is 1 minute.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.sink.collection.period</name>
@@ -490,6 +536,7 @@
     <description>
       The interval between two service metrics data exports.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.service.watcher.initial.delay</name>
@@ -498,6 +545,7 @@
       The time to delay first watcher check execution
       Default resolution is 10 minutes.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.service.watcher.delay</name>
@@ -507,6 +555,7 @@
       watcher check execution and the commencement of the next
       Default resolution is 30 seconds.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.service.watcher.timeout</name>
@@ -515,6 +564,7 @@
       The maximum time to wait for a single watcher check execution
       Default resolution is 30 seconds.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>timeline.metrics.hbase.fifo.compaction.enabled</name>
@@ -522,6 +572,7 @@
     <description>
       Enable Compaction policy for lower precision and minute aggregate tables.
     </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.2/services/FLUME/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/configuration/flume-conf.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/configuration/flume-conf.xml
index 65a8941..4b8a66d 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/configuration/flume-conf.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/configuration/flume-conf.xml
@@ -29,6 +29,7 @@
     <value>
 # Flume agent config
     </value>
+    <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.2/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/configuration/flume-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/configuration/flume-env.xml
index 22ab025..ed8f8f8 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/configuration/flume-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/configuration/flume-env.xml
@@ -26,6 +26,7 @@
     <display-name>Flume Conf Dir</display-name>
     <value>/etc/flume/conf</value>
     <description>Location to save configuration files</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -37,6 +38,7 @@
     <display-name>Flume Log Dir</display-name>
     <value>/var/log/flume</value>
     <description>Location to save log files</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -46,6 +48,7 @@
   <property>
     <name>flume_user</name>
     <value>flume</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <description>Flume User</description>
   </property>
@@ -53,6 +56,7 @@
     <name>flume_run_dir</name> 
     <value>/var/run/flume</value>      
     <description>Location to save information about running 
agents</description>       
+    <on-ambari-upgrade add="true"/>
   </property>
   
   <!-- flume-env.sh -->
@@ -94,5 +98,6 @@ fi
 export HIVE_HOME={{flume_hive_home}}
 export HCAT_HOME={{flume_hcat_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.2/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-env.xml
index b06d11d..64b79d6 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-env.xml
@@ -26,6 +26,7 @@
     <display-name>HBase Log Dir Prefix</display-name>
     <value>/var/log/hbase</value>
     <description>Log Directories for HBase.</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -37,6 +38,7 @@
     <display-name>HBase PID Dir</display-name>
     <value>/var/run/hbase</value>
     <description>Pid Directory for HBase.</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -48,6 +50,7 @@
     <value>4096</value>
     <description>Maximum amount of memory each HBase RegionServer can 
use.</description>
     <display-name>HBase RegionServer Maximum Memory</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>1024</minimum>
@@ -64,6 +67,7 @@
                and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this 
value.
     </description>
     <display-name>RegionServers maximum value for -Xmn</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <unit>MB</unit>
@@ -74,6 +78,7 @@
     <display-name>RegionServers -Xmn in -Xmx ratio</display-name>
     <value>0.2</value>
     <description>Percentage of max heap size (-Xmx) which used for young 
generation heap (-Xmn).</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>float</type>
     </value-attributes>
@@ -83,6 +88,7 @@
     <value>4096</value>
     <description>Maximum amount of memory each HBase Master can 
use.</description>
     <display-name>HBase Master Maximum Memory</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>1024</minimum>
@@ -94,6 +100,7 @@
    <property>
     <name>hbase_user</name>
     <value>hbase</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <description>HBase User Name.</description>
   </property>
@@ -102,6 +109,7 @@
     <value>false</value>
     <description>Enable Phoenix SQL</description>
     <display-name>Enable Phoenix</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>value-list</type>
       <entries>
@@ -191,6 +199,7 @@ export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS 
-Xmx{{master_heapsize}}"
 export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70  
-Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}"
 {% endif %}
     </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.2/services/HBASE/configuration/hbase-javaopts-properties.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-javaopts-properties.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-javaopts-properties.xml
index 2731124..0478822 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-javaopts-properties.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-javaopts-properties.xml
@@ -23,6 +23,7 @@
     <name>content</name>
     <description>Hbase-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.2/services/HBASE/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-log4j.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-log4j.xml
index b310192..d8672e8 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-log4j.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-log4j.xml
@@ -138,6 +138,7 @@ 
log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
 # log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
 
     </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.2/services/HBASE/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-policy.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-policy.xml
index bf1a7d7..3cede3d 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-policy.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-policy.xml
@@ -29,6 +29,7 @@
     The ACL is a comma-separated list of user and group names. The user and 
     group list is separated by a blank. For e.g. "alice,bob users,wheel". 
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -39,6 +40,7 @@
     The ACL is a comma-separated list of user and group names. The user and 
     group list is separated by a blank. For e.g. "alice,bob users,wheel". 
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -49,5 +51,6 @@
     The ACL is a comma-separated list of user and group names. The user and 
     group list is separated by a blank. For e.g. "alice,bob users,wheel". 
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
index 2511b9f..a8d9301 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
@@ -32,6 +32,7 @@
     into /tmp.  Change this configuration else all data will be lost
     on machine restart.
     </description>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>hbase.cluster.distributed</name>
@@ -41,12 +42,14 @@
       false, startup will run all HBase and ZooKeeper daemons together
       in the one JVM.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.port</name>
     <value>16000</value>
     <display-name>HBase Master Port</display-name>
     <description>The port the HBase Master should bind to.</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
       <type>int</type>
@@ -61,6 +64,7 @@
     machine restart).
     </description>
     <display-name>HBase tmp directory</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
     </value-attributes>
@@ -70,27 +74,32 @@
     <value>${hbase.tmp.dir}/local</value>
     <description>Directory on the local filesystem to be used as a local 
storage
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.info.bindAddress</name>
     <value>0.0.0.0</value>
     <description>The bind address for the HBase Master web UI
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.info.port</name>
     <value>16010</value>
     <description>The port for the HBase Master web UI.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.port</name>
     <value>16020</value>
     <description>The port the HBase Region Server should bind to.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.info.port</name>
     <value>16030</value>
     <description>The port for the HBase RegionServer web UI.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -103,6 +112,7 @@
       watermark (hbase.regionserver.global.memstore.size.lower.limit) is 
reached.
     </description>
     <display-name>% of RegionServer Allocated to Write Buffers</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>float</type>
       <minimum>0</minimum>
@@ -117,6 +127,7 @@
     Same property is used by the Master for count of master handlers.
     </description>
     <display-name>Number of Handlers per RegionServer</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>5</minimum>
@@ -131,6 +142,7 @@
       Time between major compactions. Set to 0 to disable automatic major 
compactions.
     </description>
     <display-name>Major Compaction Interval</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>0</minimum>
@@ -145,6 +157,7 @@
       a given amount of time either side of hbase.hregion.majorcompaction. The 
smaller the number,
       the closer the compactions will happen to the 
hbase.hregion.majorcompaction
       interval.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.hregion.memstore.block.multiplier</name>
@@ -158,6 +171,7 @@
     worse, we OOME.
     </description>
     <display-name>Per-Column Family Memstore Block Multiplier</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>value-list</type>
       <entries>
@@ -181,6 +195,7 @@
       The size of an individual memstore. Each column familiy within each 
region is allocated its own memstore.
     </description>
     <display-name>Per-Column Family Memstore Flush Size</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>33554432</minimum>
@@ -198,6 +213,7 @@
       heavy write loads. This can reduce the frequency of stop-the-world
       GC pauses on large heaps.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
@@ -210,6 +226,7 @@
       value, the region is split in two.
     </description>
     <display-name>Maximum Region File Size</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>1073741824</minimum>
@@ -229,6 +246,7 @@
     than the scanner timeout; i.e. hbase.regionserver.lease.period
     </description>
     <display-name>Number of Fetched Rows when Scanning from Disk</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>100</minimum>
@@ -251,6 +269,7 @@
       it will take precedence.
     </description>
     <display-name>Zookeeper Session Timeout</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>10000</minimum>
@@ -270,6 +289,7 @@
     or less disables the check.
     </description>
     <display-name>Maximum Record Size</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>1048576</minimum>
@@ -289,6 +309,7 @@
       cases, the default value is appropriate.
     </description>
     <display-name>Maximum Store Files before Minor Compaction</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <entries>
@@ -310,6 +331,7 @@
     <description>
     The number of times the region flush operation will be retried.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   
   <property>
@@ -322,6 +344,7 @@
     blocked for this HRegion until a compaction is completed, or
     until hbase.hstore.blockingWaitTime has been exceeded.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
     </value-attributes>
@@ -331,6 +354,7 @@
     <value>0.40</value>
     <description>Percentage of RegionServer memory to allocate to read 
buffers.</description>
     <display-name>% of RegionServer Allocated to Read Buffers</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>float</type>
       <minimum>0</minimum>
@@ -348,6 +372,7 @@
     <description>Full path to the kerberos keytab file to use for logging in
     the configured HMaster server principal.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.master.kerberos.principal</name>
@@ -358,6 +383,7 @@
     portion, it will be replaced with the actual hostname of the running
     instance.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.keytab.file</name>
@@ -365,6 +391,7 @@
     <description>Full path to the kerberos keytab file to use for logging in
     the configured HRegionServer server principal.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.regionserver.kerberos.principal</name>
@@ -376,23 +403,28 @@
     running instance.  An entry for this principal must exist in the file
     specified in hbase.regionserver.keytab.file
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>hbase.rest.keytab.file</name>
     <value>/etc/security/keytabs/hbase.service.keytab</value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.rest.kerberos.principal</name>
     <value>hbase/[email protected]</value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.rest.authentication.kerberos.keytab</name>
     <value>/etc/security/keytabs/hbase.service.keytab</value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>hbase.rest.authentication.kerberos.principal</name>
     <value>HTTP/[email protected]</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <!-- Additional configuration specific to HBase security -->
@@ -403,6 +435,7 @@
     full privileges, regardless of stored ACLs, across the cluster.
     Only used when HBase security is enabled.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -412,6 +445,7 @@
       Select Simple or Kerberos authentication. Note: Kerberos must be set up 
before the Kerberos option will take effect.
     </description>
     <display-name>Enable Authentication</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>value-list</type>
       <entries>
@@ -433,6 +467,7 @@
     <value>false</value>
     <description> Set Authorization Method.</description>
     <display-name>Enable Authorization</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>value-list</type>
       <entries>
@@ -458,6 +493,7 @@
   <property>
     <name>hbase.table.sanity.checks</name>
     <value>true</value>
+    <on-ambari-upgrade add="true"/>
   </property>
   
 
@@ -470,6 +506,7 @@
     it in HBase's classpath and add the fully qualified class name here.
     A coprocessor can also be loaded on demand by setting HTableDescriptor.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
@@ -491,6 +528,7 @@
     <description>A comma-separated list of RegionServerObserver coprocessors 
that
       are to be registered and run within the context of the HBase region 
server.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
@@ -512,6 +550,7 @@
       implementing your own MasterObserver, just put it in HBase's classpath
       and add the fully qualified class name here.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
@@ -529,6 +568,7 @@
     <description>Property from ZooKeeper's config zoo.cfg.
     The port at which the clients will connect.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <!--
@@ -545,6 +585,7 @@
     list of ZooKeeper quorum servers. If HBASE_MANAGES_ZK is set in 
hbase-env.sh
     this is the list of servers which we will start/stop ZooKeeper on.
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>multiLine</type>
     </value-attributes>
@@ -561,6 +602,7 @@
     and will not be downgraded.  ZooKeeper versions before 3.4 do not support 
multi-update and will
     not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495).
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>zookeeper.znode.parent</name>
@@ -570,6 +612,7 @@
       By default, all of HBase's ZooKeeper file path are configured with a
       relative path, so they will all go under this directory unless changed.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
  
   <property>
@@ -582,6 +625,7 @@
     retrying every ten seconds.  See HConstants#RETRY_BACKOFF for how the 
backup
     ramps up.  Change this setting and hbase.client.pause to suit your 
workload.</description>
     <display-name>Maximum Client Retries</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>5</minimum>
@@ -599,6 +643,7 @@
       but will eventually throw a TimeoutException.
     </description>
     <display-name>HBase RPC Timeout</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>10000</minimum>
@@ -618,6 +663,7 @@
       cases, the default value is appropriate.
     </description>
     <display-name>Maximum Files in a Store before Compaction</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <entries>
@@ -658,6 +704,7 @@
       in a region server hits 
hbase.regionserver.global.memstore.size.lower.limit.
     </description>
     <display-name>% of RegionServer Allocated to Write Buffers</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>float</type>
       <minimum>0</minimum>
@@ -670,33 +717,39 @@
     <name>hbase.defaults.for.version.skip</name>
     <value>true</value>
     <description>Disables version verification.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>dfs.domain.socket.path</name>
     <value>/var/lib/hadoop-hdfs/dn_socket</value>
     <description>Path to domain socket.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>hbase.replication</name>
     <value>true</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>hbase.rest.authentication.type</name>
     <value>simple</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>hbase.rest.port</name>
     <value>8091</value>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>hbase.regionserver.wal.codec</name>
     <display-name>RegionServer WAL Codec</display-name>
     <value>org.apache.hadoop.hbase.regionserver.wal.WALCellCodec</value>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>hbase-env</type>
@@ -707,6 +760,7 @@
   <property>
     <name>hbase.region.server.rpc.scheduler.factory.class</name>
     <value></value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
@@ -720,6 +774,7 @@
   <property>
     <name>hbase.rpc.controllerfactory.class</name>
     <value></value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
@@ -733,6 +788,7 @@
   <property>
     <name>phoenix.functions.allowUserDefinedFunctions</name>
     <value> </value>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>hbase-env</type>
@@ -745,6 +801,7 @@
     <value>60000</value>
     <description>Number of milliseconds after which a Phoenix query will 
timeout on the client.</description>
     <display-name>Phoenix Query Timeout</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>30000</minimum>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
index 3e9c5b6..99a0266 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
@@ -24,6 +24,7 @@
     <name>xasecure.audit.is.enabled</name>
     <value>true</value>
     <description>Is Audit enabled?</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -31,6 +32,7 @@
     <value>false</value>
     <display-name>Audit to DB</display-name>
     <description>Is Audit to DB enabled?</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
@@ -46,17 +48,20 @@
     <name>xasecure.audit.destination.db.jdbc.url</name>
     <value>{{audit_jdbc_url}}</value>
     <description>Audit DB JDBC URL</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>xasecure.audit.destination.db.user</name>
     <value>{{xa_audit_db_user}}</value>
     <description>Audit DB JDBC User</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>PASSWORD</property-type>
     <description>Audit DB JDBC Password</description>
   </property>
@@ -65,18 +70,21 @@
     <name>xasecure.audit.destination.db.jdbc.driver</name>
     <value>{{jdbc_driver}}</value>
     <description>Audit DB JDBC Driver</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>xasecure.audit.credential.provider.file</name>
     <value>jceks://file{{credential_file}}</value>
     <description>Credential file store</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>xasecure.audit.destination.db.batch.filespool.dir</name>
     <value>/var/log/hbase/audit/db/spool</value>
     <description>/var/log/hbase/audit/db/spool</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -84,6 +92,7 @@
     <value>true</value>
     <display-name>Audit to HDFS</display-name>
     <description>Is Audit to HDFS enabled?</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
@@ -99,6 +108,7 @@
     <name>xasecure.audit.destination.hdfs.dir</name>
     <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
     <description>HDFS folder to write audit to, make sure the service user has 
requried permissions</description>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>ranger-env</type>
@@ -111,6 +121,7 @@
     <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
     <value>/var/log/hbase/audit/hdfs/spool</value>
     <description>/var/log/hbase/audit/hdfs/spool</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <!-- Removing auditing to Solr   
@@ -119,6 +130,7 @@
     <value>false</value>
     <display-name>Audit to SOLR</display-name>
     <description>Is Solr audit enabled?</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
@@ -134,6 +146,7 @@
     <name>xasecure.audit.destination.solr.urls</name>
     <value></value>
     <description>Solr URL</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
@@ -149,6 +162,7 @@
     <name>xasecure.audit.destination.solr.zookeepers</name>
     <value>NONE</value>
     <description>Solr Zookeeper string</description>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>ranger-admin-site</type>
@@ -161,6 +175,7 @@
     <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
     <value>/var/log/hbase/audit/solr/spool</value>
     <description>/var/log/hbase/audit/solr/spool</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   -->
     
@@ -169,6 +184,7 @@
     <value>true</value>
     <display-name>Audit provider summary enabled</display-name>
     <description>Enable Summary audit?</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>boolean</type>
     </value-attributes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
index af31e2b..69cf517 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
@@ -24,6 +24,7 @@
     <name>common.name.for.certificate</name>
     <value></value>
     <description>Common name for certificate, this value should match what is 
specified in repo within ranger admin</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
         <empty-value-valid>true</empty-value-valid>
     </value-attributes>   
@@ -34,6 +35,7 @@
     <value>ambari-qa</value>
     <display-name>Policy user for HBASE</display-name>
     <description>This user must be system user and also present at Ranger 
admin portal</description>
+    <on-ambari-upgrade add="true"/>
   </property>
   
   <property>
@@ -41,6 +43,7 @@
     <value>No</value>
     <display-name>Enable Ranger for HBASE</display-name>
     <description>Enable ranger hbase plugin ?</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>boolean</type>
       <overridable>false</overridable>
@@ -58,12 +61,14 @@
     <value>hbase</value>
     <display-name>Ranger repository config user</display-name>
     <description>Used for repository creation on ranger admin</description>
+    <on-ambari-upgrade add="true"/>
   </property> 
 
   <property>
     <name>REPOSITORY_CONFIG_PASSWORD</name>
     <value>hbase</value>
     <display-name>Ranger repository config password</display-name>
+    <on-ambari-upgrade add="true"/>
     <property-type>PASSWORD</property-type>
     <description>Used for repository creation on ranger admin</description>
   </property> 
@@ -72,132 +77,158 @@
   <property>
     <name>XAAUDIT.DB.IS_ENABLED</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property> 
 
   <property>
     <name>XAAUDIT.HDFS.IS_ENABLED</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.DESTINTATION_FILE</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>SSL_KEYSTORE_FILE_PATH</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>SSL_KEYSTORE_PASSWORD</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>SSL_TRUSTSTORE_FILE_PATH</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>SSL_TRUSTSTORE_PASSWORD</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>UPDATE_XAPOLICIES_ON_GRANT_REVOKE</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property>
   
   <property>
     <name>POLICY_MGR_URL</name>
     <deleted>true</deleted>   
+    <on-ambari-upgrade add="true"/>
   </property> 
   
   <property>
     <name>SQL_CONNECTOR_JAR</name>
     <deleted>true</deleted>
+    <on-ambari-upgrade add="true"/>
   </property> 
   
   <property>
     <name>XAAUDIT.DB.FLAVOUR</name>
     <deleted>true</deleted>   
+    <on-ambari-upgrade add="true"/>
   </property> 
   
   <property>
     <name>XAAUDIT.DB.DATABASE_NAME</name>
     <deleted>true</deleted>    
+    <on-ambari-upgrade add="true"/>
   </property> 
   
   <property>
     <name>XAAUDIT.DB.USER_NAME</name>
     <deleted>true</deleted>    
+    <on-ambari-upgrade add="true"/>
   </property> 
   
   <property>
     <name>XAAUDIT.DB.PASSWORD</name>
     <deleted>true</deleted>   
+    <on-ambari-upgrade add="true"/>
   </property>
   
   <property>
     <name>XAAUDIT.DB.HOSTNAME</name>
     <deleted>true</deleted>    
+    <on-ambari-upgrade add="true"/>
   </property>
   
   <property>
     <name>REPOSITORY_NAME</name>
     <deleted>true</deleted>   
+    <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.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
index b6e5cab..11ddecd 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
@@ -24,6 +24,7 @@
                <name>xasecure.policymgr.clientssl.keystore</name>
                
<value>/usr/iop/current/hbase-client/conf/ranger-plugin-keystore.jks</value>
                <description>Java Keystore files</description>
+         <on-ambari-upgrade add="true"/>
        </property>
 
        <property>
@@ -31,12 +32,14 @@
                <value>myKeyFilePassword</value>
                <property-type>PASSWORD</property-type>
                <description>password for keystore</description>
+         <on-ambari-upgrade add="true"/>
        </property>
 
        <property>
                <name>xasecure.policymgr.clientssl.truststore</name>
                
<value>/usr/iop/current/hbase-client/conf/ranger-plugin-truststore.jks</value>
                <description>java truststore file</description>
+         <on-ambari-upgrade add="true"/>
        </property>
 
        <property>
@@ -44,18 +47,21 @@
                <value>changeit</value>
                <property-type>PASSWORD</property-type>
                <description>java  truststore password</description>
+         <on-ambari-upgrade add="true"/>
        </property>
 
     <property>
                
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
                <value>jceks://file{{credential_file}}</value>
                <description>java  keystore credential file</description>
+         <on-ambari-upgrade add="true"/>
        </property>
 
        <property>
                
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
                <value>jceks://file{{credential_file}}</value>
                <description>java  truststore credential file</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.2/services/HBASE/configuration/ranger-hbase-security.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-security.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-security.xml
index 5f6bd94..98498d5 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-security.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-security.xml
@@ -23,36 +23,42 @@
     <name>ranger.plugin.hbase.service.name</name>
     <value>{{repo_name}}</value>
     <description>Name of the Ranger service containing HBase 
policies</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>ranger.plugin.hbase.policy.source.impl</name>
     <value>org.apache.ranger.admin.client.RangerAdminRESTClient</value>
     <description>Class to retrieve policies from the source</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>ranger.plugin.hbase.policy.rest.url</name>
     <value>{{policymgr_mgr_url}}</value>
     <description>URL to Ranger Admin</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>ranger.plugin.hbase.policy.rest.ssl.config.file</name>
     <value>/etc/hbase/conf/ranger-policymgr-ssl.xml</value>
     <description>Path to the file containing SSL details to contact Ranger 
Admin</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>ranger.plugin.hbase.policy.pollIntervalMs</name>
     <value>30000</value>
     <description>How often to poll for changes in policies?</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>ranger.plugin.hbase.policy.cache.dir</name>
     <value>/etc/ranger/{{repo_name}}/policycache</value>
     <description>Directory where Ranger policies are cached after successful 
retrieval from the source</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -60,9 +66,10 @@
     <value>true</value>
     <display-name>Should HBase GRANT/REVOKE update XA policies</display-name>
     <description>Should HBase plugin update Ranger policies for updates to 
permissions done using GRANT/REVOKE?</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
   </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.2/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/core-site.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/core-site.xml
index 09d304a..aeac5dd 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/core-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/core-site.xml
@@ -26,6 +26,7 @@
     <name>ha.failover-controller.active-standby-elector.zk.op.retries</name>
     <value>120</value>
     <description>ZooKeeper Failover Controller retries setting for your 
environment</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 <!-- i/o properties -->
@@ -37,6 +38,7 @@
   The size of this buffer should probably be a multiple of hardware
   page size (4096 on Intel x86), and it determines how much data is
   buffered during read and write operations.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -44,6 +46,7 @@
     <value>org.apache.hadoop.io.serializer.WritableSerialization</value>
     <description> A list of comma-delimited serialization classes that can be 
used for obtaining serializers and deserializers.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -51,6 +54,7 @@
     
<value>org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
     <description>A list of the compression codec classes that can be used
                  for compression/decompression.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 <!-- file system properties -->
@@ -62,6 +66,7 @@
     <description>The name of the default file system.  Either the
   literal string "local" or a host:port for NDFS.</description>
     <final>true</final>
+    <on-ambari-upgrade add="false"/>
   </property>
 
   <property>
@@ -73,6 +78,7 @@
         If trash is disabled server side then the client side configuration is 
checked.
         If trash is enabled on the server side then the value configured on 
the server is used and the client configuration value is ignored.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <!-- ipc properties: copied from kryptonite configuration -->
@@ -82,6 +88,7 @@
     <description>Defines the threshold number of connections after which
                connections will be inspected for idleness.
   </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -90,12 +97,14 @@
     <description>The maximum time after which a client will bring down the
                connection to the server.
   </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>ipc.client.connect.max.retries</name>
     <value>50</value>
     <description>Defines the maximum number of retries for IPC 
connections.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -107,6 +116,7 @@
       decrease latency
       with a cost of more/smaller packets.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <!-- Web Interface Configuration -->
@@ -118,6 +128,7 @@
                 not be exposed to public. Enable this option if the interfaces
                 are only reachable by those who have the right authorization.
   </description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
  <property>
@@ -127,6 +138,7 @@
    Set the authentication for the cluster. Valid values are: simple or
    kerberos.
    </description>
+    <on-ambari-upgrade add="true"/>
  </property>
 <property>
   <name>hadoop.security.authorization</name>
@@ -134,6 +146,7 @@
   <description>
      Enable authorization for different protocols.
   </description>
+    <on-ambari-upgrade add="true"/>
 </property>
 
   <property>
@@ -184,6 +197,7 @@ If you want to treat all principals from APACHE.ORG with 
/admin as "admin", your
 RULE[2:$1%$2@$0](.%[email protected])s/./admin/
 DEFAULT
     </description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>multiLine</type>
     </value-attributes>
@@ -194,6 +208,7 @@ DEFAULT
     <description>
       Location of topology script used by Hadoop to determine the rack 
location of nodes.
     </description>
+    <on-ambari-upgrade add="true"/>
   </property>
   
   <!-- This property added from HDP2.2 stack for Ranger -->
@@ -201,12 +216,14 @@ DEFAULT
     <name>hadoop.http.authentication.simple.anonymous.allowed</name>
     <value>true</value>
     <description></description>
+    <on-ambari-upgrade add="true"/>
   </property>
   
   <!-- This property added from HDP2.2 stack for Ranger -->
   <property>
     <name>hadoop.security.key.provider.path</name>
     <value></value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-env.xml
index 2fc6bdf..a299e75 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-env.xml
@@ -26,6 +26,7 @@
     <display-name>Hadoop Log Dir Prefix</display-name>
     <value>/var/log/hadoop</value>
     <description>Hadoop Log Dir Prefix</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -37,6 +38,7 @@
     <display-name>Hadoop PID Dir Prefix</display-name>
     <value>/var/run/hadoop</value>
     <description>Hadoop PID Dir Prefix</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <overridable>false</overridable>
@@ -48,6 +50,7 @@
     <value>INFO,RFA</value>
     <description>Hadoop Root Logger</description>
     <display-name>Hadoop Root Logger</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -57,6 +60,7 @@
     <display-name>Hadoop maximum Java heap size</display-name>
     <value>1024</value>
     <description>Hadoop maximum Java heap size</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <unit>MB</unit>
@@ -68,6 +72,7 @@
     <value>1024</value>
     <description>NameNode Java heap size</description>
     <display-name>NameNode Java heap size</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>0</minimum>
@@ -88,6 +93,7 @@
     <value>200</value>
     <description>Default size of Java new generation for NameNode (Java option 
-XX:NewSize) Note: The value of NameNode new generation size (default size of 
Java new generation for NameNode (Java option -XX:NewSize)) should be 1/8 of 
maximum heap size (-Xmx). Ensure that the value of the namenode_opt_newsize 
property is 1/8 the value of maximum heap size (-Xmx).</description>
     <display-name>NameNode new generation size</display-name>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>hadoop-env</type>
@@ -108,6 +114,7 @@
     <value>200</value>
     <description>NameNode maximum new generation size</description>
     <display-name>NameNode maximum new generation size</display-name>
+    <on-ambari-upgrade add="true"/>
     <depends-on>
       <property>
         <type>hadoop-env</type>
@@ -128,6 +135,7 @@
     <value>128</value>
     <description>NameNode permanent generation size</description>
     <display-name>NameNode permanent generation size</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>0</minimum>
@@ -142,6 +150,7 @@
     <value>256</value>
     <description>NameNode maximum permanent generation size</description>
     <display-name>NameNode maximum permanent generation size</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>0</minimum>
@@ -156,6 +165,7 @@
     <value>1024</value>
     <description>DataNode maximum Java heap size</description>
     <display-name>DataNode maximum Java heap size</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <minimum>0</minimum>
@@ -168,6 +178,7 @@
     <name>proxyuser_group</name>
     <display-name>Proxy User Group</display-name>
     <value>users</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>GROUP</property-type>
     <description>Proxy user group.</description>
   </property>
@@ -175,6 +186,7 @@
     <name>hdfs_user</name>
     <display-name>HDFS User</display-name>
     <value>hdfs</value>
+    <on-ambari-upgrade add="true"/>
     <property-type>USER</property-type>
     <description>User to run HDFS as</description>
   </property>
@@ -183,22 +195,26 @@
     <name>hdfs_user_nofile_limit</name>
     <value>128000</value>
     <description>Max open files limit setting for HDFS user.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>hdfs_user_nproc_limit</name>
     <value>65536</value>
     <description>Max number of processes limit setting for HDFS 
user.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>hdfs_user_keytab</name>
     <description>HDFS keytab path</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
     <name>hdfs_principal_name</name>
     <description>HDFS principal name</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -210,6 +226,7 @@
       if a path was previously mounted on a drive.
     </description>
     <display-name>File that stores mount point for each data dir</display-name>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>directory</type>
       <visible>true</visible>
@@ -220,6 +237,7 @@
     <value> </value>
     <display-name>Key Server Host</display-name>
     <description>Hostnames where Key Management Server is 
installed</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>string</type>
     </value-attributes>
@@ -229,6 +247,7 @@
     <value></value>
     <display-name>Key Server Port</display-name>
     <description>Port number where Key Management Server is 
available</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <empty-value-valid>true</empty-value-valid>
@@ -381,11 +400,13 @@ if [ "$command" == "datanode" ] &#038;&#038; [ "$EUID" 
-eq 0 ] &#038;&#038; [ -n
 fi
 {% endif %}
     </value>
+    <on-ambari-upgrade add="true"/>
   </property>
   <property>
     <name>nfsgateway_heapsize</name>
     <value>1024</value>
     <description>Maximum Java heap size for NFSGateway (Java option 
-Xmx)</description>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <type>int</type>
       <unit>MB</unit>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-policy.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-policy.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-policy.xml
index 31db924..692ab90 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-policy.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hadoop-policy.xml
@@ -29,6 +29,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -39,6 +40,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -49,6 +51,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -59,6 +62,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -69,6 +73,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -79,6 +84,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -89,6 +95,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -99,6 +106,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
  <property>
@@ -108,6 +116,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
   <property>
@@ -118,6 +127,7 @@
     group names. The user and group list is separated by a blank. For
     e.g. "alice,bob users,wheel".  A special value of "*" means all
     users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 <property>
@@ -128,6 +138,7 @@
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
+    <on-ambari-upgrade add="true"/>
   </property>
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-log4j.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-log4j.xml
index fbb0e5c..0b41b6c 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-log4j.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-log4j.xml
@@ -217,6 +217,7 @@ 
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
 # messages from BlockManager in NameNode.
 #log4j.logger.BlockStateChange=WARN
     </value>
+    <on-ambari-upgrade add="true"/>
     <value-attributes>
       <show-property-name>false</show-property-name>
     </value-attributes>

Reply via email to