You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/07/11 15:25:36 UTC
[01/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 8e1af7a99 -> 1d6fcfa19
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-hbase-solr.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-hbase-solr.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-hbase-solr.xml
index 0ca6807..dd45141 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-hbase-solr.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-hbase-solr.xml
@@ -58,6 +58,7 @@ index.search.solr.mode=cloud
index.search.solr.zookeeper-url={{solr_server_host}}/solr
index.search.solr.configset=titan
</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/TITAN/configuration/titan-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-log4j.xml
index 3363d81..f61a479 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-log4j.xml
@@ -57,6 +57,7 @@
# log4j level means it will be at WARN by default, which is ideal.
log4j.logger.org.apache.hadoop.mapred.LocalDistributedCacheManager=${gremlin.log4j.level}
</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/YARN/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration-mapred/mapred-env.xml
index 9a9d6ee..1536ff6 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration-mapred/mapred-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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>
@@ -64,12 +68,14 @@
<name>mapred_user_nofile_limit</name>
<value>32768</value>
<description>Max open files limit setting for MAPREDUCE user.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapred_user_nproc_limit</name>
<value>65536</value>
<description>Max number of processes limit setting for MAPREDUCE user.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- mapred-env.sh -->
@@ -92,5 +98,6 @@ export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA
export HADOOP_OPTS="-Djava.io.tmpdir={{hadoop_java_io_tmpdir}} $HADOOP_OPTS"
export JAVA_LIBRARY_PATH="${JAVA_LIBRARY_PATH}:{{hadoop_java_io_tmpdir}}
</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/YARN/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration-mapred/mapred-site.xml
index 7d58e23..c11b459 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration-mapred/mapred-site.xml
@@ -32,6 +32,7 @@
By default, gives each merge stream 1MB, which should minimize seeks.
</description>
<display-name>Sort Allocation Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -57,6 +58,7 @@
is already in progress, so spills may be larger than this threshold when
it is set to less than .5
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -66,6 +68,7 @@
The number of streams to merge at once while sorting files.
This determines the number of open file handles.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- map/reduce properties -->
@@ -75,6 +78,7 @@
<description>
Administrators for MapReduce applications.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -84,6 +88,7 @@
The default number of parallel transfers run by reduce during
the copy(shuffle) phase.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -93,6 +98,7 @@
If true, then multiple instances of some map tasks
may be executed in parallel.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -102,6 +108,7 @@
If true, then multiple instances of some reduce tasks may be
executed in parallel.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -111,6 +118,7 @@
Fraction of the number of maps in the job which should be complete before
reduces are scheduled for the job.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -119,6 +127,7 @@
<description>
Limit on the number of counters allowed per job.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -130,6 +139,7 @@
storing in-memory map outputs, as defined by
mapreduce.reduce.shuffle.input.buffer.percent.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -139,6 +149,7 @@
The percentage of memory to be allocated from the maximum heap
size to storing map outputs during the shuffle.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -148,6 +159,7 @@
If the job outputs are to compressed as SequenceFiles, how should
they be compressed? Should be one of NONE, RECORD or BLOCK.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -159,6 +171,7 @@
remaining map outputs in memory must consume less than this threshold before
the reduce can begin.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- copied from kryptonite configuration -->
@@ -168,6 +181,7 @@
<description>
Should the outputs of the maps be compressed before being sent across the network. Uses SequenceFile compression.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -178,6 +192,7 @@
terminated if it neither reads an input, writes an output, nor
updates its status string.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -185,6 +200,7 @@
<value>1024</value>
<description>Virtual memory for single Map task</description>
<display-name>Map Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -209,6 +225,7 @@
<value>1024</value>
<description>Virtual memory for single Reduce task</description>
<display-name>Reduce Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -236,6 +253,7 @@
ShuffleHandler is a service run at the NodeManager to facilitate
transfers of intermediate Map outputs to requesting Reducers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -244,6 +262,7 @@
<description>
Directory where history files are written by MapReduce jobs.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -252,23 +271,27 @@
<description>
Directory where history files are managed by the MR JobHistory Server.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.http.policy</name>
<value>HTTP_ONLY</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.address</name>
<value>localhost:10020</value>
<description>Enter your JobHistoryServer hostname.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.webapp.address</name>
<value>localhost:19888</value>
<description>Enter your JobHistoryServer hostname.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -278,6 +301,7 @@
The runtime framework for executing MapReduce jobs. Can be one of local,
classic or yarn.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -286,6 +310,7 @@
<description>
The staging dir used while submitting jobs.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -293,6 +318,7 @@
<value>512</value>
<description>The amount of memory the MR AppMaster needs.</description>
<display-name>AppMaster Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -329,6 +355,7 @@
mapreduce.reduce.env config settings.
</description>
<display-name>MR AppMaster Java Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>mapred-site</type>
@@ -351,6 +378,7 @@
mapreduce.reduce.env config settings.
</description>
<display-name>MR AppMaster Java Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>mapred-site</type>
@@ -363,18 +391,21 @@
<name>yarn.app.mapreduce.am.log.level</name>
<value>INFO</value>
<description>MR App Master process log level.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.admin.map.child.java.opts</name>
<value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN -Diop.version=${iop.version}</value>
<description>This property stores Java options for map tasks.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.admin.reduce.child.java.opts</name>
<value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN -Diop.version=${iop.version}</value>
<description>This property stores Java options for reduce tasks.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -384,12 +415,14 @@
CLASSPATH for MR applications. A comma-separated list of CLASSPATH
entries.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.application.framework.path</name>
<value>/iop/apps/${iop.version}/mapreduce/mapreduce.tar.gz#mr-framework</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -402,6 +435,7 @@
set by resourcemanager. Otherwise, it will be override. The default number is
set to 2, to allow at least one retry for AM.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -411,6 +445,7 @@
Larger heap-size for child jvms of maps.
</description>
<display-name>MR Map Java Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>mapred-site</type>
@@ -426,6 +461,7 @@
Larger heap-size for child jvms of reduces.
</description>
<display-name>MR Reduce Java Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>mapred-site</type>
@@ -441,6 +477,7 @@
The logging level for the map task. The allowed levels are:
OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -450,6 +487,7 @@
The logging level for the reduce task. The allowed levels are:
OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -460,6 +498,7 @@
This is not an additive property. You must preserve the original value if
you want your map and reduce tasks to have access to native libraries (compression, etc)
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -468,6 +507,7 @@
<description>
User added environment variables for the MR App Master processes.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -476,6 +516,7 @@
<description>
Should the job outputs be compressed?
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -485,6 +526,7 @@
server state upon startup. If enabled then
mapreduce.jobhistory.recovery.store.class must be specified.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -493,6 +535,7 @@
<description>The HistoryServerStateStoreService class to store history server
state for recovery.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -501,36 +544,42 @@
<description>The URI where history server state will be stored if HistoryServerLeveldbSystemStateStoreService
is configured as the recovery storage class.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.shuffle.fetch.retry.enabled</name>
<value>1</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.shuffle.fetch.retry.interval-ms</name>
<value>1000</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.shuffle.fetch.retry.timeout-ms</name>
<value>30000</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.job.emit-timeline-data</name>
<value>false</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.bind-host</name>
<value>0.0.0.0</value>
<description></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/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/capacity-scheduler.xml
index d26c67f..0fa0e99 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/capacity-scheduler.xml
@@ -23,6 +23,7 @@
<description>
Maximum number of applications that can be pending and running.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -33,6 +34,7 @@
application masters i.e. controls number of concurrent running
applications.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -41,6 +43,7 @@
<description>
The queues at the this level (root is the root queue).
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -52,12 +55,14 @@
The child queues capacity should add up to their parent queue's capacity
or less.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.default.capacity</name>
<value>100</value>
<description>Default queue target capacity.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -66,6 +71,7 @@
<description>
Default queue user limit a percentage from 0.0 to 1.0.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -74,6 +80,7 @@
<description>
The maximum capacity of the default queue.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -82,6 +89,7 @@
<description>
The state of the default queue. State can be one of RUNNING or STOPPED.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -90,6 +98,7 @@
<description>
The ACL of who can submit jobs to the default queue.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -98,6 +107,7 @@
<description>
The ACL of who can administer jobs on the default queue.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -107,6 +117,7 @@
The ACL for who can administer this queue i.e. change sub-queue
allocations.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -118,6 +129,7 @@
Typically this should be set to number of nodes in the cluster, By default is setting
approximately number of nodes in one rack which is 40.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -126,12 +138,14 @@
<description>
Default minimum queue resource limit depends on the number of users who have submitted applications.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.scheduler.capacity.resource-calculator</name>
<value>org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator</value>
<display-name>CPU Scheduling</display-name>
+ <on-ambari-upgrade add="false"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -152,6 +166,7 @@
<name>yarn.scheduler.capacity.root.accessible-node-labels</name>
<value>*</value>
<description></description>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-audit.xml
index d9de749..d005eb0 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-audit.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-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/hadoop/yarn/audit/db/spool</value>
<description>/var/log/hadoop/yarn/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/hadoop/yarn/audit/hdfs/spool</value>
<description>/var/log/hadoop/yarn/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/hadoop/yarn/audit/solr/spool</value>
<description>/var/log/hadoop/yarn/audit/solr/spool</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -169,6 +184,7 @@
<value>false</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/YARN/configuration/ranger-yarn-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-plugin-properties.xml
index 0f220c4..9b5f869 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-plugin-properties.xml
@@ -25,12 +25,14 @@
<value>ambari-qa</value>
<display-name>Policy user for YARN</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.rpc.protection</name>
<value></value>
<description>Used for repository creation on ranger admin</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -40,6 +42,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>
@@ -50,6 +53,7 @@
<value>No</value>
<display-name>Enable Ranger for YARN</display-name>
<description>Enable ranger yarn plugin ?</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>ranger-env</type>
@@ -67,12 +71,14 @@
<value>yarn</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>yarn</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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
index ad69775..2ce7063 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
@@ -24,11 +24,13 @@
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/hdp/current/hadoop-client/conf/ranger-yarn-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.keystore.password</name>
<value>myKeyFilePassword</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
</property>
@@ -37,11 +39,13 @@
<name>xasecure.policymgr.clientssl.truststore</name>
<value>/usr/hdp/current/hadoop-client/conf/ranger-yarn-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.password</name>
<value>changeit</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
</property>
@@ -50,12 +54,14 @@
<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/YARN/configuration/ranger-yarn-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-security.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-security.xml
index c5eb0b5..54ee6fb 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-security.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/ranger-yarn-security.xml
@@ -24,36 +24,42 @@
<name>ranger.plugin.yarn.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this Yarn instance</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.plugin.yarn.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.yarn.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.yarn.policy.rest.ssl.config.file</name>
<value>/etc/hadoop/conf/ranger-policymgr-ssl-yarn.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.yarn.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.yarn.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>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-env.xml
index af2f49b..55384cc 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-env.xml
@@ -26,6 +26,7 @@
<display-name>YARN Log Dir Prefix</display-name>
<value>/var/log/hadoop-yarn</value>
<description>YARN Log Dir Prefix</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -37,6 +38,7 @@
<display-name>YARN PID Dir Prefix</display-name>
<value>/var/run/hadoop-yarn</value>
<description>YARN PID Dir Prefix</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -46,6 +48,7 @@
<property>
<name>yarn_user</name>
<value>yarn</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>YARN User</description>
</property>
@@ -54,6 +57,7 @@
<display-name>YARN Java heap size</display-name>
<value>1024</value>
<description>Max heapsize for all YARN components using a numerical value in the scale of MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -64,6 +68,7 @@
<display-name>ResourceManager Java heap size</display-name>
<value>1024</value>
<description>Max heapsize for ResourceManager using a numerical value in the scale of MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -75,6 +80,7 @@
<display-name>NodeManager Java heap size</display-name>
<value>1024</value>
<description>Max heapsize for NodeManager using a numerical value in the scale of MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -85,6 +91,7 @@
<display-name>Minimum user ID for submitting job</display-name>
<value>1000</value>
<description>Set to 0 to disallow root from submitting jobs. Set to 1000 to disallow all superusers from submitting jobs</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -94,6 +101,7 @@
<display-name>AppTimelineServer Java heap size</display-name>
<value>1024</value>
<description>Max heapsize for AppTimelineServer using a numerical value in the scale of MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<unit>MB</unit>
@@ -105,18 +113,21 @@
<name>is_supported_yarn_ranger</name>
<value>true</value>
<description>Set to false by default, needs to be set to true in stacks that use Ranger Yarn Plugin</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn_user_nofile_limit</name>
<value>32768</value>
<description>Max open files limit setting for YARN user.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn_user_nproc_limit</name>
<value>65536</value>
<description>Max number of processes limit setting for YARN user.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- yarn-env.sh -->
@@ -245,6 +256,7 @@
YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE"
YARN_OPTS="$YARN_OPTS -Djava.io.tmpdir={{hadoop_java_io_tmpdir}}"
</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/YARN/configuration/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-log4j.xml
index bbcd524..1127dc2 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-log4j.xml
@@ -75,6 +75,7 @@ log4j.appender.EWMA.cleanupInterval=${yarn.ewma.cleanupInterval}
log4j.appender.EWMA.messageAgeLimitSeconds=${yarn.ewma.messageAgeLimitSeconds}
log4j.appender.EWMA.maxUniqueMessages=${yarn.ewma.maxUniqueMessages}
</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/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-site.xml
index 34799f4..0bab493 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/YARN/configuration/yarn-site.xml
@@ -27,18 +27,21 @@
<name>yarn.resourcemanager.hostname</name>
<value>localhost</value>
<description>The hostname of the RM.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.resourcemanager.resource-tracker.address</name>
<value>localhost:8025</value>
<description> The address of ResourceManager. </description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.resourcemanager.scheduler.address</name>
<value>localhost:8030</value>
<description>The address of the scheduler interface.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -48,18 +51,21 @@
The address of the applications manager interface in the
RM.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.resourcemanager.admin.address</name>
<value>localhost:8141</value>
<description>The address of the RM admin interface.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.resourcemanager.scheduler.class</name>
<value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value>
<description>The class to use as the resource scheduler.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -71,6 +77,7 @@
and the specified value will get allocated at minimum.
</description>
<display-name>Minimum Container Size (Memory)</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -95,6 +102,7 @@
and will get capped to this value.
</description>
<display-name>Maximum Container Size (Memory)</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -114,6 +122,7 @@
<name>yarn.acl.enable</name>
<value>false</value>
<description> Are acls enabled. </description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -128,6 +137,7 @@
<property>
<name>yarn.authorization-provider</name>
<description> Yarn authorization provider class. </description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>ranger-yarn-plugin-properties</type>
@@ -140,6 +150,7 @@
<name>yarn.admin.acl</name>
<value>yarn</value>
<description> ACL of who can be admin of the YARN cluster. </description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -151,6 +162,7 @@
<name>yarn.nodemanager.address</name>
<value>0.0.0.0:45454</value>
<description>The address of the container manager in the NM.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -159,6 +171,7 @@
<description>Amount of physical memory, in MB, that can be allocated
for containers.</description>
<display-name>Memory allocated for all YARN containers on a node</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -172,6 +185,7 @@
<name>yarn.application.classpath</name>
<value>/etc/hadoop/conf,/usr/iop/current/hadoop-client/*,/usr/iop/current/hadoop-client/lib/*,/usr/iop/current/hadoop-hdfs-client/*,/usr/iop/current/hadoop-hdfs-client/lib/*,/usr/iop/current/hadoop-yarn-client/*,/usr/iop/current/hadoop-yarn-client/lib/*,/usr/lib/hadoop-lzo/lib/*</value>
<description>Classpath for typical applications.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -180,6 +194,7 @@
<description>
Is the registry enabled: does the RM start it up, create the user and system paths, and purge service records when containers, application attempts and applications complete
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -194,6 +209,7 @@
is allowed to exceed this allocation by this ratio.
</description>
<display-name>Virtual Memory Ratio</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
<minimum>0.1</minimum>
@@ -206,6 +222,7 @@
<name>yarn.nodemanager.container-executor.class</name>
<value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value>
<description>ContainerExecutor for launching containers</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>yarn-env</type>
@@ -218,6 +235,7 @@
<name>yarn.nodemanager.linux-container-executor.group</name>
<value>hadoop</value>
<description>Unix group of the NodeManager</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>yarn-env</type>
@@ -231,12 +249,14 @@
<value>mapreduce_shuffle</value>
<description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can
not start with numbers</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
<value>org.apache.hadoop.mapred.ShuffleHandler</value>
<description>The auxiliary service class to use </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -249,6 +269,7 @@
named container_{$contid}. Each container directory will contain the files
stderr, stdin, and syslog generated by that container.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
</value-attributes>
@@ -264,6 +285,7 @@
Individual containers' work directories, called container_${contid}, will
be subdirectories of this.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
</value-attributes>
@@ -276,6 +298,7 @@
The interval, in milliseconds, for which the node manager
waits between two cycles of monitoring its containers' memory usage.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
@@ -283,6 +306,7 @@
<name>yarn.nodemanager.health-checker.script.path</name>
<value>/etc/hadoop/conf/health_check_nodemanager</value>
<description>The health check script to run.</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -290,12 +314,14 @@
<name>yarn.nodemanager.health-checker.interval-ms</name>
<value>135000</value>
<description>Frequency of running node health script.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.health-checker.script.timeout-ms</name>
<value>60000</value>
<description>Script time out period.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -305,6 +331,7 @@
Time in seconds to retain user logs. Only applicable if
log aggregation is disabled.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -312,6 +339,7 @@
<value>true</value>
<description>Whether to enable log aggregation. </description>
<display-name>Enable Log Aggregation</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -321,6 +349,7 @@
<name>yarn.nodemanager.remote-app-log-dir</name>
<value>/app-logs</value>
<description>Location to aggregate logs to. </description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -333,6 +362,7 @@
The remote log dir will be created at
{yarn.nodemanager.remote-app-log-dir}/${user}/{thisParam}.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -341,6 +371,7 @@
<description>
T-file compression types used to compress aggregated logs.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -361,6 +392,7 @@
of the Yarn applications' log directories is configurable with the
yarn.nodemanager.log-dirs property (see also below).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -370,6 +402,7 @@
How long to keep aggregation logs before deleting them. -1 disables.
Be careful set this too small and you will spam the name node.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -379,6 +412,7 @@
Environment variables that should be forwarded from the NodeManager's
environment to the container's.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -391,6 +425,7 @@
If there are less number of healthy local-dirs (or log-dirs) available,
then new containers will not be launched on this node.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -404,6 +439,7 @@
the resourcemanager will override it. The default number is set to 2, to
allow at least one retry for AM.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -412,6 +448,7 @@
<description>
The address of the RM web application.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -420,6 +457,7 @@
<description>
The https address of the RM web application.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -428,6 +466,7 @@
<description>
Whether virtual memory limits will be enforced for containers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -436,6 +475,7 @@
<description>
URI for the HistoryServer's log resource
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -447,6 +487,7 @@
file must be specified. If the value is empty, no hosts are
excluded.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -455,6 +496,7 @@
<description>Indicate to clients whether timeline service is enabled or not.
If enabled, clients will put entities and events to the timeline server.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -466,6 +508,7 @@
<description>
Store class name for history store, defaulting to file system store
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -474,6 +517,7 @@
<description>
Store file name for leveldb timeline store
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -485,6 +529,7 @@
<description>
Size of read cache for uncompressed blocks for leveldb timeline store in bytes.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -493,6 +538,7 @@
<description>
Size of cache for recently written entity start times for leveldb timeline store in number of entities.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -501,6 +547,7 @@
<description>
The http address of the timeline service web application.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -509,6 +556,7 @@
<description>
The http address of the timeline service web application.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -518,12 +566,14 @@
This is default address for the timeline server to start
the RPC server.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.timeline-service.ttl-enable</name>
<description>Enable age off of timeline store data.</description>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -533,6 +583,7 @@
<description>Time to live for timeline store data in milliseconds.</description>
<name>yarn.timeline-service.ttl-ms</name>
<value>2678400000</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -542,6 +593,7 @@
<description>Length of time to wait between deletion cycles of leveldb timeline store in milliseconds.</description>
<name>yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms</name>
<value>300000</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -551,12 +603,14 @@
<name>yarn.timeline-service.client.max-retries</name>
<value>30</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.timeline-service.client.retry-interval-ms</name>
<value>1000</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Default Values Set for IOP Stack -->
@@ -566,6 +620,7 @@
<name>yarn.nodemanager.recovery.enabled</name>
<value>true</value>
<description>Enable the node manager to recover after starting</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -575,18 +630,21 @@
The local filesystem directory in which the node manager will store
state when recovery is enabled.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.client.nodemanager-connect.retry-interval-ms</name>
<value>10000</value>
<description>Time interval between each attempt to connect to NM</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.client.nodemanager-connect.max-wait-ms</name>
<value>60000</value>
<description>Max time to wait to establish a connection to NM</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -596,6 +654,7 @@
Enable RM to recover state after starting.
If true, then yarn.resourcemanager.store.class must be specified.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -605,6 +664,7 @@
Enable RM work preserving recovery. This configuration is private to YARN for experimenting the feature.
</description>
<display-name>Enable Work Preserving Restart</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -619,6 +679,7 @@
the store is implicitly fenced; meaning a single ResourceManager
is able to use the store at any point in time.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -627,36 +688,42 @@
<description>
List Host:Port of the ZooKeeper servers to be used by the RM. comma separated host:port pairs, each corresponding to a zk server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002" If the optional chroot suffix is used the example would look like: "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002/app/a" where the client would be rooted at "/app/a" and all paths would be relative to this root - ie getting/setting/etc... "/foo/bar" would result in operations being run on "/app/a/foo/bar" (from the server perspective).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.zk-state-store.parent-path</name>
<value>/rmstore</value>
<description>Full path of the ZooKeeper znode where RM state will be stored. This must be supplied when using org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore as the value for yarn.resourcemanager.store.class</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.zk-acl</name>
<value>world:anyone:rwcda </value>
<description>ACL's to be used for ZooKeeper znodes.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.work-preserving-recovery.scheduling-wait-ms</name>
<value>10000</value>
<description>Set the amount of time RM waits before allocating new containers on work-preserving-recovery. Such wait period gives RM a chance to settle down resyncing with NMs in the cluster on recovery, before assigning new containers to applications.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.connect.retry-interval.ms</name>
<value>30000</value>
<description>How often to try connecting to the ResourceManager.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.connect.max-wait.ms</name>
<value>900000</value>
<description>Maximum time to wait to establish connection to ResourceManager</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -667,42 +734,49 @@
automatically from yarn.resourcemanager.zk-timeout-ms and
yarn.resourcemanager.zk-num-retries."
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.zk-num-retries</name>
<value>1000</value>
<description>Number of times RM tries to connect to ZooKeeper.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.zk-timeout-ms</name>
<value>10000</value>
<description>ZooKeeper session timeout in milliseconds. Session expiration is managed by the ZooKeeper cluster itself, not by the client. This value is used by the cluster to determine when the client's session expires. Expirations happens when the cluster does not hear from the client within the specified session timeout period (i.e. no heartbeat).</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.state-store.max-completed-applications</name>
<value>${yarn.resourcemanager.max-completed-applications}</value>
<description>The maximum number of completed applications RM state store keeps, less than or equals to ${yarn.resourcemanager.max-completed-applications}. By default, it equals to ${yarn.resourcemanager.max-completed-applications}. This ensures that the applications kept in the state store are consistent with the applications remembered in RM memory. Any values larger than ${yarn.resourcemanager.max-completed-applications} will be reset to ${yarn.resourcemanager.max-completed-applications}. Note that this value impacts the RM recovery performance.Typically, a smaller value indicates better performance on RM recovery.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.fs.state-store.retry-policy-spec</name>
<value>2000, 500</value>
<description>hdfs client retry policy specification. hdfs client retry is always enabled. Specified in pairs of sleep-time and number-of-retries and (t0, n0), (t1, n1), ..., the first n0 retries sleep t0 milliseconds on average, the following n1 retries sleep t1 milliseconds on average, and so on.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.fs.state-store.uri</name>
<value> </value>
<description>RI pointing to the location of the FileSystem path where RM state will be stored. This must be supplied when using org.apache.hadoop.yarn.server.resourcemanager.recovery.FileSystemRMStateStore as the value for yarn.resourcemanager.store.class </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.ha.enabled</name>
<value>false</value>
<description>enable RM HA or not</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Isolation -->
@@ -710,6 +784,7 @@
<name>yarn.nodemanager.linux-container-executor.resources-handler.class</name>
<value>org.apache.hadoop.yarn.server.nodemanager.util.DefaultLCEResourcesHandler</value>
<description>Pre-requisite to use CGroups</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>yarn-env</type>
@@ -722,6 +797,7 @@
<name>yarn.nodemanager.linux-container-executor.cgroups.hierarchy</name>
<value>hadoop-yarn</value>
<description>Name of the Cgroups hierarchy under which all YARN jobs will be launched</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>yarn-env</type>
@@ -734,6 +810,7 @@
<name>yarn.nodemanager.linux-container-executor.cgroups.mount</name>
<value>false</value>
<description>If true, YARN will automount the CGroup, however the directory needs to already exist; else, the cgroup should be mounted by the admin</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>yarn-env</type>
@@ -746,6 +823,7 @@
<name>yarn.nodemanager.linux-container-executor.cgroups.mount-path</name>
<value>/cgroup</value>
<description>mount</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>yarn-env</type>
@@ -758,6 +836,7 @@
<name>yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage</name>
<value>false</value>
<description>Strictly limit CPU resource usage to allocated usage even if spare CPU is available</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Scheduler -->
@@ -766,6 +845,7 @@
<value>8</value>
<description></description>
<display-name>Number of virtual cores</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -784,6 +864,7 @@
<value>80</value>
<description>The amount of CPU allocated for YARN containers - only effective when used with CGroups</description>
<display-name>Percentage of physical CPU allocated for all containers on a node</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -799,12 +880,14 @@
Defines authentication used for the Timeline Server HTTP endpoint.
Supported values are: simple | kerberos | $AUTHENTICATION_HANDLER_CLASSNAME
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.timeline-service.http-authentication.simple.anonymous.allowed</name>
<value>true</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -816,6 +899,7 @@
tokens(fallback to kerberos if the tokens are missing).
Only applicable when the http authentication type is kerberos.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -826,6 +910,7 @@
I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values,
with blank as the default.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -836,6 +921,7 @@
I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values,
with blank as the default.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -846,22 +932,26 @@
with blank as the default.
</description>
<value>0.0.0.0</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.system-metrics-publisher.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.system-metrics-publisher.enabled</name>
<value>true</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.system-metrics-publisher.dispatcher.pool-size</name>
<value>10</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -869,12 +959,14 @@
<value>false</value>
<description> Is the registry enabled: does the RM start it up, create the user and system paths, and purge service records when
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.registry.zk.quorum</name>
<value>localhost:2181</value>
<description> List of hostname:port pairs defining the zookeeper quorum binding for the registry </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -884,9 +976,7 @@
Enable node labels to restrict YARN applications so that they run only on cluster nodes that have a specified node label.
</description>
<display-name>Node Labels</display-name>
- <value-attributes>
- <type>boolean</type>
- </value-attributes>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -907,12 +997,14 @@
<name>yarn.node-labels.fs-store.root-dir</name>
<value>/system/yarn/node-labels</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.scheduler.monitor.enable</name>
<value>false</value>
<display-name>Pre-emption</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -934,6 +1026,7 @@
<value>1</value>
<description></description>
<display-name>Minimum Container Size (VCores)</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -953,6 +1046,7 @@
<value>8</value>
<description></description>
<display-name>Maximum Container Size (VCores)</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -973,6 +1067,7 @@
<description>
This configures the HTTP endpoint for Yarn Daemons.The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : Service is provided only on https
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -981,12 +1076,14 @@
<description>Enable timeline server to recover state after starting. If
true, then yarn.timeline-service.state-store-class must be specified.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.timeline-service.leveldb-state-store.path</name>
<value>/hadoop/yarn/timeline</value>
<description>Store file name for leveldb state store.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -996,30 +1093,35 @@
<name>yarn.timeline-service.state-store-class</name>
<value>org.apache.hadoop.yarn.server.timeline.recovery.LeveldbTimelineStateStore</value>
<description>Store class name for timeline state store.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.node-labels.fs-store.retry-policy-spec</name>
<value>2000, 500</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb</name>
<value>1000</value>
<description>This is related to disk size on the machines, admins should set one of yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb or yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage but not both. If both are set, the more conservative value will be used</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage</name>
<value>90</value>
<description>This is related to disk size on the machines, admins should set one of yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb or yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage but not both. If both are set, the more conservative value will be used</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds</name>
<value>-1</value>
<description>Defines how often NMs wake up to upload log files. The default value is -1. By default, the logs will be uploaded whenthe application is finished. By setting this configure, logs can be uploaded periodically when the application is running. The minimum rolling-interval-seconds can be set is 3600.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1029,24 +1131,28 @@
This configuration is for debug and test purpose.
By setting this configuration as true.
We can break the lower bound of yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.log-aggregation.num-log-files-per-app</name>
<value>30</value>
<description>This is temporary solution. The configuration will be deleted once, we find a more scalable method to only write a single log file per LRS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.system-metrics-publisher.dispatcher.pool-size</name>
<value>10</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<description>Plugins that can translate a timeline entity read request into a list of timeline cache ids, separated by commas.</description>
<name>yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes</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/ZOOKEEPER/configuration/zoo.cfg.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zoo.cfg.xml
index 58574c7..157b754 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zoo.cfg.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zoo.cfg.xml
@@ -26,6 +26,7 @@
<display-name>Length of single Tick</display-name>
<value>2000</value>
<description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -37,6 +38,7 @@
<display-name>Ticks to allow for sync at Init</display-name>
<value>10</value>
<description>Ticks to allow for sync at Init.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -47,6 +49,7 @@
<display-name>Ticks to allow for sync at Runtime</display-name>
<value>5</value>
<description>Ticks to allow for sync at Runtime.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -57,6 +60,7 @@
<display-name>Port for running ZK Server</display-name>
<value>2181</value>
<description>Port for running ZK Server.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -67,6 +71,7 @@
<display-name>ZooKeeper directory</display-name>
<value>/hadoop/zookeeper</value>
<description>Data directory for ZooKeeper.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -75,10 +80,12 @@
<name>autopurge.snapRetainCount</name>
<value>30</value>
<description>ZooKeeper purge feature retains the autopurge.snapRetainCount most recent snapshots and the corresponding transaction logs in the dataDir and dataLogDir respectively and deletes the rest. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>autopurge.purgeInterval</name>
<value>24</value>
<description>The time interval in hours for which the purge task has to be triggered. Set to a positive integer (1 and above) to enable the auto purging.</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/ZOOKEEPER/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zookeeper-env.xml
index 87cb0fd..332cd4d 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zookeeper-env.xml
@@ -24,6 +24,7 @@
<property>
<name>zk_user</name>
<value>zookeeper</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>ZooKeeper User.</description>
</property>
@@ -32,6 +33,7 @@
<display-name>ZooKeeper Log Dir</display-name>
<value>/var/log/zookeeper</value>
<description>ZooKeeper Log Dir</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<editable-only-at-install>true</editable-only-at-install>
@@ -43,6 +45,7 @@
<display-name>ZooKeeper PID Dir</display-name>
<value>/var/run/zookeeper</value>
<description>ZooKeeper Pid Dir</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<editable-only-at-install>true</editable-only-at-install>
@@ -69,5 +72,6 @@ export SERVER_JVMFLAGS="$SERVER_JVMFLAGS -Djava.security.auth.login.config={{zk_
export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_client_jaas_file}}"
{% 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/ZOOKEEPER/configuration/zookeeper-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
index 5f1e295..20f572f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
@@ -96,6 +96,7 @@ log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
### Notice we are including log4j's NDC here (%x)
log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
[09/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/core-site.xml
index f833896..34836ce 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/core-site.xml
@@ -31,6 +31,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>
@@ -38,6 +39,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>
@@ -45,6 +47,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 -->
@@ -56,6 +59,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>
@@ -64,6 +68,7 @@
<description>Number of minutes between trash checkpoints.
If zero, the trash feature is disabled.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- ipc properties: copied from kryptonite configuration -->
@@ -73,6 +78,7 @@
<description>Defines the threshold number of connections after which
connections will be inspected for idleness.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -81,12 +87,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>
@@ -98,6 +106,7 @@
decrease latency
with a cost of more/smaller packets.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Web Interface Configuration -->
@@ -109,6 +118,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>
@@ -118,6 +128,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>
@@ -125,6 +136,7 @@
<description>
Enable authorization for different protocols.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -175,6 +187,7 @@ If you want to treat all principals from APACHE.ORG with /admin as "admin", your
RULE[2:$1%$2@$0](.%admin@APACHE.ORG)s/./admin/
DEFAULT
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>multiLine</type>
</value-attributes>
@@ -185,5 +198,6 @@ DEFAULT
<description>
Location of topology script used by Hadoop to determine the rack location of nodes.
</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/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hadoop-env.xml
index ba575b0..c79ac73 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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>
@@ -81,6 +86,7 @@
<value>200</value>
<description>NameNode new generation size</description>
<display-name>NameNode new generation size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hadoop-env</type>
@@ -101,6 +107,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>
@@ -121,6 +128,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>
@@ -135,6 +143,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>
@@ -149,6 +158,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>
@@ -160,12 +170,14 @@
<property>
<name>proxyuser_group</name>
<value>users</value>
+ <on-ambari-upgrade add="true"/>
<property-type>GROUP</property-type>
<description>Proxy user group.</description>
</property>
<property>
<name>hdfs_user</name>
<value>hdfs</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>User to run HDFS as</description>
</property>
@@ -178,6 +190,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>
@@ -303,6 +316,7 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/iop/current/hadoop-client/lib
#Hadoop logging options. Modify and uncomment to change logging level
#export HADOOP_ROOT_LOGGER={{hadoop_root_logger}}
</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/HDFS/configuration/hadoop-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hadoop-policy.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hadoop-policy.xml
index 41bde16..04ccddd 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hadoop-policy.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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.0/services/HDFS/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hdfs-log4j.xml
index 08822eb..d874772 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hdfs-log4j.xml
@@ -196,6 +196,7 @@ log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter
# Removes "deprecated" messages
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=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/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hdfs-site.xml
index fc510fa..f5b1255 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/hdfs-site.xml
@@ -34,6 +34,7 @@
directories, for redundancy. </description>
<display-name>NameNode directories</display-name>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
<overridable>false</overridable>
@@ -45,6 +46,7 @@
<value>true</value>
<description>to enable dfs append</description>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -53,6 +55,7 @@
<display-name>WebHDFS enabled</display-name>
<description>Whether to enable WebHDFS feature</description>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
<overridable>false</overridable>
@@ -65,6 +68,7 @@
<description> Number of failed disks a DataNode would tolerate before it stops offering service</description>
<final>true</final>
<display-name>DataNode failed disk tolerance</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -90,6 +94,7 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
</value-attributes>
@@ -102,6 +107,7 @@
not permitted to connect to the namenode. The full pathname of the
file must be specified. If the value is empty, no hosts are
excluded.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
@@ -112,6 +118,7 @@
permitted to connect to the namenode. The full pathname of the file
must be specified. If the value is empty, all hosts are
permitted.</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -124,6 +131,7 @@
If this is a comma-delimited list of directories then the image is
replicated in all of the directories for redundancy.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
<overridable>false</overridable>
@@ -139,6 +147,7 @@
replicated in all of the directoires for redundancy.
Default value is same as dfs.namenode.checkpoint.dir
</description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -147,6 +156,7 @@
<value>21600</value>
<display-name>HDFS Maximum Checkpoint Delay</display-name>
<description>The number of seconds between two periodic checkpoints.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>seconds</unit>
@@ -160,6 +170,7 @@
of the namespace every 'dfs.namenode.checkpoint.txns' transactions,
regardless of whether 'dfs.namenode.checkpoint.period' has expired.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -167,6 +178,7 @@
<value>50</value>
<description>Maximal block replication.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -174,6 +186,7 @@
<value>3</value>
<description>Default block replication.</description>
<display-name>Block replication</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -183,12 +196,14 @@
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -201,6 +216,7 @@
Values greater than 1 will make safe mode permanent.
</description>
<display-name>Minimum replicated blocks %</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
<minimum>0.990</minimum>
@@ -217,6 +233,7 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -225,6 +242,7 @@
<description>
This property is used by HftpFileSystem.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -233,6 +251,7 @@
<description>
The datanode server address and port for data transfer.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -241,6 +260,7 @@
<description>
The datanode http server address and port.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -249,12 +269,14 @@
<description>
The datanode https server address and port.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.blocksize</name>
<value>134217728</value>
<description>The default block size for new files.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -263,6 +285,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>
@@ -271,6 +294,7 @@
<value>1073741824</value>
<display-name>Reserved space for HDFS</display-name>
<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>bytes</unit>
@@ -284,12 +308,14 @@
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.blockreport.initialDelay</name>
<value>120</value>
<description>Delay for first block report in seconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -297,6 +323,7 @@
<value>8192</value>
<description>Specifies the maximum number of threads to use for transferring data in and out of the datanode.</description>
<display-name>DataNode max data transfer threads</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -312,6 +339,7 @@
<description>
The octal umask used when creating files and directories.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -324,12 +352,14 @@
Switching from one parameter value to the other does not change the mode,
owner or group of files or directories.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions.superusergroup</name>
<value>hdfs</value>
<description>The name of the group of super-users.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -337,6 +367,7 @@
<value>64</value>
<description>Added to grow Queue size so that more client connections are allowed</description>
<display-name>NameNode Server threads</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>1</minimum>
@@ -351,6 +382,7 @@
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -359,6 +391,7 @@
<description>
Kerberos principal name for the NameNode
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -367,6 +400,7 @@
<description>
Kerberos principal name for the secondary NameNode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -378,6 +412,7 @@
<value>HTTP/_HOST@EXAMPLE.COM</value>
<description>The Kerberos principal for the host that the NameNode runs on.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -385,6 +420,7 @@
<value>HTTP/_HOST@EXAMPLE.COM</value>
<description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -392,6 +428,7 @@
<name>dfs.namenode.secondary.http-address</name>
<value>localhost:50090</value>
<description>Address of secondary namenode web server</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -402,6 +439,7 @@
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -411,6 +449,7 @@
The Kerberos keytab file with the credentials for the
HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -419,6 +458,7 @@
<description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -427,6 +467,7 @@
<description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -435,6 +476,7 @@
<description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -443,13 +485,14 @@
<description>
The filename of the keytab file for the DataNode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.https-address</name>
<value>localhost:50470</value>
<description>The https address where namenode binds</description>
-
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -460,6 +503,7 @@
directories. The datanode will not come up if the permissions are
different on existing dfs.datanode.data.dir directories. If the directories
don't exist, they will be created with this permission.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -473,6 +517,7 @@
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -482,6 +527,7 @@
<name>dfs.cluster.administrators</name>
<value> hdfs</value>
<description>ACL for who all can view the default servlets in the HDFS</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<visible>true</visible>
</value-attributes>
@@ -495,6 +541,7 @@
heartbeat messages have not been received by the namenode for more than a
specified time interval.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.avoid.write.stale.datanode</name>
@@ -504,6 +551,7 @@
heartbeat messages have not been received by the namenode for more than a
specified time interval.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.write.stale.datanode.ratio</name>
@@ -511,11 +559,13 @@
<description>When the ratio of number stale datanodes to total datanodes marked is greater
than this ratio, stop avoiding writing to stale nodes so as to prevent causing hotspots.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.stale.datanode.interval</name>
<value>30000</value>
<description>Datanode is stale after not getting a heartbeat in this interval in ms</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -523,12 +573,14 @@
<value>0.0.0.0:8480</value>
<description>The address and port the JournalNode web UI listens on.
If the port is 0 then the server will start on a free port. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.journalnode.edits.dir</name>
<value>/grid/0/hdfs/journal</value>
<description>The path where the JournalNode daemon will store its local state. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- HDFS Short-Circuit Local Reads -->
@@ -538,6 +590,7 @@
<value>true</value>
<description>This configuration parameter turns on short-circuit local reads.</description>
<display-name>HDFS Short-circuit read</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -550,6 +603,7 @@
This is a path to a UNIX domain socket that will be used for communication between the DataNode and local HDFS clients.
If the string "_PORT" is present in this path, it will be replaced by the TCP port of the DataNode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -561,6 +615,7 @@
more file descriptors, but potentially provide better performance on
workloads involving lots of seeks.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -568,39 +623,47 @@
<value>true</value>
<description>Set to true to enable NameNode to attempt recovering a previously failed dfs.namenode.name.dir.
When enabled, a recovery of any failed directory is attempted during checkpoint.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.handler.count</name>
<value>40</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.acls.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.client.file-block-storage-locations.timeout.millis</name>
<value>3000</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.client.mmap.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.max.locked.memory</name>
<value>0</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.hdfs-blocks-metadata.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.http.policy</name>
<value>HTTP_ONLY</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/HDFS/configuration/ssl-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-client.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-client.xml
index 4513fdd..01d8108 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-client.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-client.xml
@@ -22,15 +22,18 @@
<name>ssl.client.truststore.location</name>
<value>/etc/security/clientKeys/all.jks</value>
<description>Location of the trust store file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.truststore.type</name>
<value>jks</value>
<description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.truststore.password</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password to open the trust store file.</description>
</property>
@@ -38,20 +41,24 @@
<name>ssl.client.truststore.reload.interval</name>
<value>10000</value>
<description>Truststore reload interval, in milliseconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.keystore.type</name>
<value>jks</value>
<description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.keystore.location</name>
<value>/etc/security/clientKeys/keystore.jks</value>
<description>Location of the keystore file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.keystore.password</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password to open the keystore file.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-server.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-server.xml
index f95793e..8e41f19 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-server.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/configuration/ssl-server.xml
@@ -22,15 +22,18 @@
<name>ssl.server.truststore.location</name>
<value>/etc/security/serverKeys/all.jks</value>
<description>Location of the trust store file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.truststore.type</name>
<value>jks</value>
<description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.truststore.password</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password to open the trust store file.</description>
</property>
@@ -38,26 +41,31 @@
<name>ssl.server.truststore.reload.interval</name>
<value>10000</value>
<description>Truststore reload interval, in milliseconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.keystore.type</name>
<value>jks</value>
<description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.keystore.location</name>
<value>/etc/security/serverKeys/keystore.jks</value>
<description>Location of the keystore file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.keystore.password</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password to open the keystore file.</description>
</property>
<property>
<name>ssl.server.keystore.keypassword</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password for private key in keystore file.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hcat-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hcat-env.xml
index df3f949..5088aee 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hcat-env.xml
@@ -52,6 +52,7 @@
USER={{hcat_user}}
METASTORE_PORT={{hive_metastore_port}}
</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/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-env.xml
index 1f8e64b..666be68 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-env.xml
@@ -25,24 +25,28 @@
<name>hive.heapsize</name>
<value>1024</value>
<description>Hive Java heap size</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.client.heapsize</name>
<value>512</value>
<description>Hive Client Java heap size</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.heapsize</name>
<value>1024</value>
<description>Hive Metastore Java heap size</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_database_type</name>
<value>mysql</value>
<description>Default HIVE DB type.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_database</name>
@@ -51,6 +55,7 @@
<description>
Property that determines whether the HIVE DB is managed by Ambari.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -60,22 +65,26 @@
<display-name>Database Type</display-name>
<value>MySQL</value>
<description>Database type.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_database_name</name>
<value>hive</value>
<description>Database name.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_dbroot</name>
<value>/usr/lib/hive/lib/</value>
<description>Hive DB Directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_log_dir</name>
<display-name>Hive Log Dir</display-name>
<value>/var/log/hive</value>
<description>Directory for Hive Log files.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -87,6 +96,7 @@
<display-name>Hive PID Dir</display-name>
<value>/var/run/hive</value>
<description>Hive PID Dir.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -96,6 +106,7 @@
<property>
<name>hive_user</name>
<value>hive</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>Hive User.</description>
</property>
@@ -107,6 +118,7 @@
<display-name>WebHCat Log Dir</display-name>
<value>/var/log/webhcat</value>
<description>WebHCat Log Dir.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -118,6 +130,7 @@
<display-name>WebHCat Pid Dir</display-name>
<value>/var/run/webhcat</value>
<description>WebHCat Pid Dir.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -127,12 +140,14 @@
<property>
<name>hcat_user</name>
<value>hcat</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>HCat User.</description>
</property>
<property>
<name>webhcat_user</name>
<value>hcat</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>WebHCat User.</description>
</property>
@@ -190,6 +205,7 @@ ${HIVE_AUX_JARS_PATH}
export METASTORE_PORT={{hive_metastore_port}}
</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/HIVE/configuration/hive-exec-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-exec-log4j.xml
index 3e17d2d..3a70d7c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-exec-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-exec-log4j.xml
@@ -113,6 +113,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,RFA
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=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/HIVE/configuration/hive-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-log4j.xml
index f7f789b..8fa7a70 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-log4j.xml
@@ -131,6 +131,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,RFA
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=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/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-site.xml
index 5f2bc18..39c002e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/hive-site.xml
@@ -23,6 +23,7 @@ limitations under the License.
<name>hive.cbo.enable</name>
<value>true</value>
<description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -34,6 +35,7 @@ limitations under the License.
org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager,
2. When HiveServer2 supports service discovery via Zookeeper.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>multiLine</type>
<empty-value-valid>true</empty-value-valid>
@@ -44,12 +46,14 @@ limitations under the License.
<name>hive.metastore.connect.retries</name>
<value>24</value>
<description>Number of retries while opening a connection to metastore</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.failure.retries</name>
<value>24</value>
<description>Number of retries upon failure of Thrift metastore calls</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -59,6 +63,7 @@ limitations under the License.
Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
Number of seconds for the client to wait between consecutive connection attempts
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -68,6 +73,7 @@ limitations under the License.
Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
MetaStore Client socket timeout in seconds
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -77,6 +83,7 @@ limitations under the License.
Size per reducer.The default is 1G, i.e if the input size is 10G, it
will use 10 reducers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -86,6 +93,7 @@ limitations under the License.
The Hive client authorization manager class name. The user defined authorization class should implement
interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -93,12 +101,14 @@ limitations under the License.
<value>org.apache.hadoop.hive.thrift.ZooKeeperTokenStore</value>
<description>The delegation token store implementation.
Set to org.apache.hadoop.hive.thrift.ZooKeeperTokenStore for load-balanced cluster.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.cluster.delegation.token.store.zookeeper.connectString</name>
<value>localhost:2181</value>
<description>The ZooKeeper token store connect string.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -109,6 +119,7 @@ limitations under the License.
when it is brought up. JDBC/ODBC clients should use the ZooKeeper ensemble: hive.zookeeper.quorum
in their connection string.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -118,24 +129,28 @@ limitations under the License.
<name>fs.hdfs.impl.disable.cache</name>
<value>true</value>
<description>Disable HDFS filesystem cache.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.file.impl.disable.cache</name>
<value>true</value>
<description>Disable local filesystem cache.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.scratchdir</name>
<value>/tmp/hive</value>
<description>HDFS root scratch dir for Hive jobs which gets created with write all (733) permission. For each connecting user, an HDFS scratch dir: ${hive.exec.scratchdir}/<username> is created, with ${hive.scratch.dir.permission}.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.submitviachild</name>
<value>false</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -146,6 +161,7 @@ limitations under the License.
separate JVM (true recommended) or not.
Avoids the overhead of spawning new JVM, but can lead to out-of-memory issues.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -155,6 +171,7 @@ limitations under the License.
This controls whether the final outputs of a query (to a local/HDFS file or a Hive table) is compressed.
The compression codec and other options are determined from Hadoop config variables mapred.output.compress*
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -164,12 +181,14 @@ limitations under the License.
This controls whether intermediate files produced by Hive between multiple map-reduce jobs are compressed.
The compression codec and other options are determined from Hadoop config variables mapred.output.compress*
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.reducers.bytes.per.reducer</name>
<value>67108864</value>
<description>size per reducer.The default is 256Mb, i.e if the input size is 1G, it will use 4 reducers.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -179,6 +198,7 @@ limitations under the License.
max number of reducers will be used. If the one specified in the configuration parameter mapred.reduce.tasks is
negative, Hive will use this one as the max number of reducers when automatically determine number of reducers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -189,6 +209,7 @@ limitations under the License.
A pre-execution hook is specified as the name of a Java class which implements the
org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -199,6 +220,7 @@ limitations under the License.
A post-execution hook is specified as the name of a Java class which implements the
org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -209,30 +231,35 @@ limitations under the License.
An on-failure hook is specified as the name of Java class which implements the
org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.parallel</name>
<value>false</value>
<description>Whether to execute jobs in parallel</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.parallel.thread.number</name>
<value>8</value>
<description>How many jobs at most can be executed in parallel</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.mapred.reduce.tasks.speculative.execution</name>
<value>false</value>
<description>Whether speculative execution for reducers should be turned on. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.dynamic.partition</name>
<value>true</value>
<description>Whether or not to allow dynamic partitions in DML/DDL.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -243,42 +270,49 @@ limitations under the License.
in case the user accidentally overwrites all partitions.
NonStrict allows all partitions of a table to be dynamic.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.max.dynamic.partitions</name>
<value>5000</value>
<description>Maximum number of dynamic partitions allowed to be created in total.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.max.dynamic.partitions.pernode</name>
<value>2000</value>
<description>Maximum number of dynamic partitions allowed to be created in each mapper/reducer node.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.max.created.files</name>
<value>100000</value>
<description>Maximum number of HDFS files created by all mappers/reducers in a MapReduce job.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.warehouse.dir</name>
<value>/apps/hive/warehouse</value>
<description>location of default database for the warehouse</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.uris</name>
<value>thrift://localhost:9083</value>
<description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property require-input = "true">
<name>javax.jdo.option.ConnectionPassword</name>
<display-name>Database Password</display-name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>password to use against metastore database</description>
<value-attributes>
@@ -294,18 +328,21 @@ limitations under the License.
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>hive.metastore.server.max.threads</name>
<value>100000</value>
<description>Maximum number of worker threads in the Thrift server's pool.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.kerberos.keytab.file</name>
<value>/etc/security/keytabs/hive.service.keytab</value>
<description>The path to the Kerberos Keytab file containing the metastore Thrift server's service principal.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -315,18 +352,21 @@ limitations under the License.
The service principal for the metastore Thrift server.
The special string _HOST will be replaced automatically with the correct host name.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.cluster.delegation.token.store.zookeeper.znode</name>
<value>/hive/cluster/delegation</value>
<description>The root path for token store data.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.cache.pinobjtypes</name>
<value>Table,Database,Type,FieldSchema,Order</value>
<description>List of comma separated metastore object types that should be pinned in the cache</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -336,6 +376,7 @@ limitations under the License.
whenever databases, tables, and partitions are created, altered, or dropped.
Set to org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener
if metastore-side authorization is desired.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -347,6 +388,7 @@ limitations under the License.
question doesn't have permissions to delete the corresponding directory
on the storage).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -354,6 +396,7 @@ limitations under the License.
<display-name>JDBC Driver Class</display-name>
<value>com.mysql.jdbc.Driver</value>
<description>Driver class name for a JDBC metastore</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -364,6 +407,7 @@ limitations under the License.
<display-name>Database Username</display-name>
<value>hive</value>
<description>Username to use against metastore database</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>db_user</type>
<overridable>false</overridable>
@@ -374,18 +418,21 @@ limitations under the License.
<name>hive.map.aggr</name>
<value>true</value>
<description>Whether to use map-side aggregation in Hive Group By queries</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.smbjoin.cache.rows</name>
<value>10000</value>
<description>How many rows with the same key value should be cached in memory per smb joined table.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.map.aggr.hash.percentmemory</name>
<value>0.5</value>
<description>Portion of total memory to be used by map-side group aggregation hash table</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -395,6 +442,7 @@ limitations under the License.
The max memory to be used by map-side group aggregation hash table.
If the memory usage is higher than this number, force to flush data
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -404,24 +452,28 @@ limitations under the License.
Hash aggregation will be turned off if the ratio between hash table size and input rows is bigger than this number.
Set to 1 to make sure hash aggregation is never turned off.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.merge.mapfiles</name>
<value>true</value>
<description>Merge small files at the end of a map-only job</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.merge.mapredfiles</name>
<value>false</value>
<description>Merge small files at the end of a map-reduce job</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.merge.size.per.task</name>
<value>256000000</value>
<description>Size of merged files at the end of the job</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -432,12 +484,14 @@ limitations under the License.
map-reduce job to merge the output files into bigger files. This is only done for map-only jobs
if hive.merge.mapfiles is true, and for map-reduce jobs if hive.merge.mapredfiles is true.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.merge.rcfile.block.level</name>
<value>true</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -449,18 +503,21 @@ limitations under the License.
for small ORC files. Note that enabling this config will not honor padding tolerance
config (hive.exec.orc.block.padding.tolerance).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.orc.default.stripe.size</name>
<value>67108864</value>
<description>Define the default ORC stripe size</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.orc.default.compress</name>
<value>ZLIB</value>
<description>Define the default compression codec for ORC file</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -471,6 +528,7 @@ limitations under the License.
Define the compression strategy to use while writing data.
This changes the compression level of higher level compression codec (like ZLIB).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -480,18 +538,21 @@ limitations under the License.
If turned on splits generated by orc will include metadata about the stripes in the file. This
data is read remotely (from the client or HS2 machine) and sent to all the tasks.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.orc.compute.splits.num.threads</name>
<value>10</value>
<description>How many threads orc should use to create splits in parallel.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.join</name>
<value>true</value>
<description>Whether Hive enables the optimization about converting common join into mapjoin based on the input file size</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.join.noconditionaltask</name>
@@ -501,23 +562,27 @@ limitations under the License.
If this parameter is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than the
specified size, the join is directly converted to a mapjoin (there is no conditional task).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.limit.optimize.enable</name>
<value>true</value>
<description>Whether to enable to optimization to trying a smaller subset of data for simple LIMIT first.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.enforce.bucketing</name>
<value>true</value>
<description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.enforce.sorting</name>
<value>true</value>
<description>Whether sorting is enforced. If true, while inserting into the table, sorting is enforced.</description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -525,12 +590,14 @@ limitations under the License.
<name>hive.enforce.sortmergebucketmapjoin</name>
<value>true</value>
<description>If the user asked for sort-merge bucketed map-side join, and it cannot be performed, should the query fail or not ?</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.sortmerge.join</name>
<value>true</value>
<description>Will the join be automatically converted to a sort-merge join, if the joined tables pass the criteria for sort-merge join.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -546,22 +613,26 @@ limitations under the License.
with few files (10 files), the sort-merge join will only use 10 mappers, and a simple map-only join might be faster
if the complete small table can fit in memory, and a map-join can be performed.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.constant.propagation</name>
<value>true</value>
<description>Whether to enable constant propagation optimizer</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.metadataonly</name>
<value>true</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.null.scan</name>
<value>true</value>
<description>Dont scan relations which are guaranteed to not generate any rows</description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -571,6 +642,7 @@ limitations under the License.
<description>If the tables being joined are bucketized on the join columns, and the number of buckets in one table
is a multiple of the number of buckets in the other table, the buckets can be joined with each other by setting
this parameter as true.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -580,6 +652,7 @@ limitations under the License.
Remove extra map-reduce jobs if the data is already clustered by the same key which needs to be used again.
This should always be set to true. Since it is a new feature, it has been made configurable.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.reducededuplication.min.reducer</name>
@@ -589,6 +662,7 @@ limitations under the License.
That means if reducer-num of the child RS is fixed (order by or forced bucketing) and small, it can make very slow, single MR.
The optimization will be automatically disabled if number of reducers would be less than specified value.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.sort.dynamic.partition</name>
@@ -598,11 +672,13 @@ limitations under the License.
This way we can keep only one record writer open for each partition value
in the reducer thereby reducing the memory pressure on reducers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.stats.autogather</name>
<value>true</value>
<description>A flag to gather statistics automatically during the INSERT OVERWRITE command.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.stats.dbclass</name>
@@ -611,6 +687,7 @@ limitations under the License.
Expects one of the pattern in [jdbc(:.*), hbase, counter, custom, fs].
The storage that stores temporary Hive statistics. Currently, jdbc, hbase, counter and custom type are supported.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -624,6 +701,7 @@ limitations under the License.
from metastore. When this flag is disabled, Hive will make calls to filesystem to get file sizes
and will estimate the number of rows from row schema.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.stats.fetch.column.stats</name>
@@ -634,24 +712,28 @@ limitations under the License.
can be expensive when the number of columns is high. This flag can be used to disable fetching
of column statistics from metastore.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.zookeeper.client.port</name>
<value>2181</value>
<description>The port of ZooKeeper servers to talk to. If the list of Zookeeper servers specified in hive.zookeeper.quorum,does not contain port numbers, this value is used.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.zookeeper.namespace</name>
<value>hive_zookeeper_namespace</value>
<description>The parent node under which all ZooKeeper nodes are created.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.txn.manager</name>
<value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -663,6 +745,7 @@ limitations under the License.
streaming data into Hive. But it will also increase the number of
open transactions at any given time, possibly impacting read performance.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -671,6 +754,7 @@ limitations under the License.
<description>
Support concurrency and use locks, needed for Transactions. Requires Zookeeper.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -679,6 +763,7 @@ limitations under the License.
<description>
Whether to print the names of the columns in query output.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -689,6 +774,7 @@ limitations under the License.
Time before a given compaction in working state is declared a failure
and returned to the initiated state.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.check.interval</name>
@@ -698,12 +784,14 @@ limitations under the License.
Time between checks to see if any partitions need compacted.
This should be kept high because each check for compaction requires many calls against the NameNode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.delta.pct.threshold</name>
<value>0.1f</value>
<description>Percentage (by size) of base that deltas can be before major compaction is initiated.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.fetch.task.conversion</name>
@@ -717,6 +805,7 @@ limitations under the License.
1. minimal : SELECT STAR, FILTER on partition columns, LIMIT only
2. more : SELECT, FILTER, LIMIT only (support TABLESAMPLE and virtual columns)
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.fetch.task.conversion.threshold</name>
@@ -726,6 +815,7 @@ limitations under the License.
is calculated by summation of file lengths. If it's not native, storage handler for the table
can optionally implement org.apache.hadoop.hive.ql.metadata.InputEstimator interface.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -736,12 +826,14 @@ limitations under the License.
final aggregations in single reduce task. If this is set true, Hive delegates final aggregation
stage to fetch task, possibly decreasing the query time.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.authorization.enabled</name>
<value>false</value>
<description>enable or disable the Hive client authorization</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -754,6 +846,7 @@ limitations under the License.
hive client authenticator manager class name. The user defined authenticator should implement
interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -764,12 +857,14 @@ limitations under the License.
The user defined authorization class should implement interface
org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.metastore.authorization.auth.reads</name>
<value>true</value>
<description>If this is true, metastore authorizer authorizes read actions on database, table</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -779,24 +874,28 @@ limitations under the License.
authenticator manager class name to be used in the metastore for authentication.
The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.logging.operation.enabled</name>
<value>true</value>
<description>When true, HS2 will save operation logs</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.logging.operation.log.location</name>
<value>${java.io.tmpdir}/${user.name}/operation_logs</value>
<description>Top level directory where operation logs are stored if logging functionality is enabled</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.zookeeper.namespace</name>
<value>hiveserver2</value>
<description>The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -806,18 +905,21 @@ limitations under the License.
Expects one of [binary, http].
Transport mode of HiveServer2.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.thrift.http.port</name>
<value>10001</value>
<description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'http'.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.thrift.http.path</name>
<value>cliservice</value>
<description>Path component of URL endpoint when in HTTP mode.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -825,6 +927,7 @@ limitations under the License.
<display-name>HiveServer2 Port</display-name>
<value>10000</value>
<description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'binary'.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>int</type>
@@ -843,18 +946,21 @@ limitations under the License.
"auth-conf" - authentication plus integrity and confidentiality protection
This is applicable only if HiveServer2 is configured to use Kerberos authentication.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.thrift.max.worker.threads</name>
<value>500</value>
<description>Maximum number of Thrift worker threads</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.allow.user.substitution</name>
<value>true</value>
<description>Allow alternate user to be specified as part of HiveServer2 open connection request.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -872,12 +978,14 @@ limitations under the License.
hive.server2.authentication.spnego.keytab
are specified.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.authentication</name>
<description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description>
<value>NONE</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -890,6 +998,7 @@ limitations under the License.
and HTTP transport mode is used.
This needs to be set only if SPNEGO is to be used in authentication.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -900,6 +1009,7 @@ limitations under the License.
submitted the query. But if the parameter is set to false, the query will run as the user that the hiveserver2
process runs as.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.table.type.mapping</name>
@@ -911,21 +1021,25 @@ limitations under the License.
HIVE : Exposes Hive's native table types like MANAGED_TABLE, EXTERNAL_TABLE, VIRTUAL_VIEW
CLASSIC : More generic types like TABLE and VIEW
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.use.SSL</name>
<value>false</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.keystore.path</name>
<value>/etc/security/keystores/hs2keystore.jks</value>
<description>SSL certificate keystore location</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.keystore.password</name>
<value>password</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>SSL certificate keystore password</description>
</property>
@@ -934,6 +1048,7 @@ limitations under the License.
<name>hive.conf.restricted.list</name>
<value>hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role</value>
<description>Comma separated list of configuration options which are immutable at runtime</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -943,6 +1058,7 @@ limitations under the License.
Max number of entries in the vector group by aggregation hashtables.
Exceeding this will trigger a flush irrelevant of memory pressure condition.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- missing from HiveConf -->
@@ -951,9 +1067,9 @@ limitations under the License.
<display-name>Database Name</display-name>
<value>hive</value>
<description>Database name used as the Hive Metastore</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>database</type>
- <type>host</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -963,12 +1079,14 @@ limitations under the License.
<value>false</value>
<description>If true, the metastore thrift interface will be secured with SASL.
Clients must authenticate with Kerberos.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.execute.setugi</name>
<value>true</value>
<description>In unsecure mode, setting this property to true will cause the metastore to execute DFS operations using the client's reported user and group permissions. Note that this property must be set on both the client and server sides. Further note that its best effort. If client sets its to true and server sets it to false, client setting will be ignored.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -977,6 +1095,7 @@ limitations under the License.
<description> If the tables being joined are sorted and bucketized on the join columns, and they have the same number
of buckets, a sort-merge join can be performed by setting this parameter as true.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -986,6 +1105,7 @@ limitations under the License.
is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than this size, the join is directly
converted to a mapjoin(there is no conditional task). The default is 10MB.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -995,6 +1115,7 @@ limitations under the License.
This flag should be set to true to enable vectorized mode of query execution.
The default value is false.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1004,6 +1125,7 @@ limitations under the License.
This flag should be set to true to enable vectorized mode of the reduce-side of query execution.
The default value is true.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1012,6 +1134,7 @@ limitations under the License.
<description>
Whether to enable automatic use of indexes
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1020,6 +1143,7 @@ limitations under the License.
<description>
Chooses execution engine. The Option is : mr (Map reduce, default)
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1027,12 +1151,14 @@ limitations under the License.
<value>1024</value>
<!--value>4096</value-->
<description>Number of entries added to the group by aggregation hash before a recomputation of average entry size is performed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.vectorized.groupby.flush.percent</name>
<value>0.1</value>
<description>Percent of entries in the group by aggregation hash flushed when the memory threshold is exceeded.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1043,48 +1169,56 @@ limitations under the License.
stored in metastore. For basic stats collection turn on the config hive.stats.autogather to true.
For more advanced stats collection need to run analyze table queries.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.limit.pushdown.memory.usage</name>
<value>0.04</value>
<description>The max memory to be used for hash in RS operator for top K selection.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.txn.timeout</name>
<value>300</value>
<description>Time after which transactions are declared aborted if the client has not sent a heartbeat, in seconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.initiator.on</name>
<value>false</value>
<description>Whether to run the compactor's initiator thread in this metastore instance or not. If there is more than one instance of the thrift metastore this should only be set to true for one of them.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.worker.threads</name>
<value>0</value>
<description>Number of compactor worker threads to run on this metastore instance. Can be different values on different metastore instances.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.delta.num.threshold</name>
<value>10</value>
<description>Number of delta files that must exist in a directory before the compactor will attempt a minor compaction.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.abortedtxn.threshold</name>
<value>1000</value>
<description>Number of aborted transactions involving a particular table or partition before major compaction is initiated.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>datanucleus.cache.level2.type</name>
<value>none</value>
<description>Determines caching mechanism DataNucleus L2 cache will use. It is strongly recommended to use default value of 'none' as other values may cause consistency errors in Hive.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1093,6 +1227,7 @@ limitations under the License.
<description>The maximum number of bytes that a query using the compact index can read.
Negative value is equivalent to infinity.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1100,12 +1235,14 @@ limitations under the License.
<value>true</value>
<description>Set this to true if table directories should inherit the permissions of the warehouse or database directory instead of being created with permissions derived from dfs umask
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.start.cleanup.scratchdir</name>
<value>true</value>
<description>To cleanup the hive scratchdir while starting the hive 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/HIVE/configuration/webhcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-env.xml
index 2eec231..73d0d27 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-env.xml
@@ -49,6 +49,7 @@ CONSOLE_LOG={{templeton_log_dir}}/webhcat-console.log
# Set HADOOP_HOME to point to a specific hadoop install directory
export HADOOP_HOME={{hadoop_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/HIVE/configuration/webhcat-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-log4j.xml
index 0ded4d4..237aa73 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/configuration/webhcat-log4j.xml
@@ -73,6 +73,7 @@ log4j.logger.org.apache.zookeeper = WARN
log4j.logger.org.eclipse.jetty = INFO
</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
[05/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml
index 0654132..b0818bc 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml
@@ -34,6 +34,7 @@
directories, for redundancy. </description>
<display-name>NameNode directories</display-name>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
<overridable>false</overridable>
@@ -45,6 +46,7 @@
<value>true</value>
<description>to enable dfs append</description>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -53,6 +55,7 @@
<display-name>WebHDFS enabled</display-name>
<description>Whether to enable WebHDFS feature</description>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
<overridable>false</overridable>
@@ -65,6 +68,7 @@
<description> Number of failed disks a DataNode would tolerate before it stops offering service</description>
<final>true</final>
<display-name>DataNode failed disk tolerance</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -90,6 +94,7 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
</value-attributes>
@@ -102,6 +107,7 @@
not permitted to connect to the namenode. The full pathname of the
file must be specified. If the value is empty, no hosts are
excluded.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
@@ -112,6 +118,7 @@
permitted to connect to the namenode. The full pathname of the file
must be specified. If the value is empty, all hosts are
permitted.</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -124,6 +131,7 @@
If this is a comma-delimited list of directories then the image is
replicated in all of the directories for redundancy.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
<overridable>false</overridable>
@@ -139,6 +147,7 @@
replicated in all of the directories for redundancy.
Default value is same as dfs.namenode.checkpoint.dir
</description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -147,6 +156,7 @@
<value>21600</value>
<display-name>HDFS Maximum Checkpoint Delay</display-name>
<description>The number of seconds between two periodic checkpoints.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>seconds</unit>
@@ -160,6 +170,7 @@
of the namespace every 'dfs.namenode.checkpoint.txns' transactions,
regardless of whether 'dfs.namenode.checkpoint.period' has expired.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -167,6 +178,7 @@
<value>50</value>
<description>Maximal block replication.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -174,6 +186,7 @@
<value>3</value>
<description>Default block replication.</description>
<display-name>Block replication</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -183,12 +196,14 @@
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -201,6 +216,7 @@
Values greater than 1 will make safe mode permanent.
</description>
<display-name>Minimum replicated blocks %</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
<minimum>0.990</minimum>
@@ -217,6 +233,7 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -225,6 +242,7 @@
<description>
This property is used by HftpFileSystem.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -233,6 +251,7 @@
<description>
The datanode server address and port for data transfer.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -241,6 +260,7 @@
<description>
The datanode http server address and port.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -249,12 +269,14 @@
<description>
The datanode https server address and port.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.blocksize</name>
<value>134217728</value>
<description>The default block size for new files.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -263,6 +285,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>
@@ -271,6 +294,7 @@
<value>1073741824</value>
<display-name>Reserved space for HDFS</display-name>
<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>bytes</unit>
@@ -284,12 +308,14 @@
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.blockreport.initialDelay</name>
<value>120</value>
<description>Delay for first block report in seconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -297,6 +323,7 @@
<value>8192</value>
<description>Specifies the maximum number of threads to use for transferring data in and out of the datanode.</description>
<display-name>DataNode max data transfer threads</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -312,6 +339,7 @@
<description>
The octal umask used when creating files and directories.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -324,12 +352,14 @@
Switching from one parameter value to the other does not change the mode,
owner or group of files or directories.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions.superusergroup</name>
<value>hdfs</value>
<description>The name of the group of super-users.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -337,6 +367,7 @@
<value>64</value>
<description>Added to grow Queue size so that more client connections are allowed</description>
<display-name>NameNode Server threads</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>1</minimum>
@@ -351,6 +382,7 @@
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -359,6 +391,7 @@
<description>
Kerberos principal name for the NameNode
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -367,6 +400,7 @@
<description>
Kerberos principal name for the secondary NameNode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -378,6 +412,7 @@
<value>HTTP/_HOST@EXAMPLE.COM</value>
<description>The Kerberos principal for the host that the NameNode runs on.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -385,6 +420,7 @@
<value>HTTP/_HOST@EXAMPLE.COM</value>
<description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -392,6 +428,7 @@
<name>dfs.namenode.secondary.http-address</name>
<value>localhost:50090</value>
<description>Address of secondary namenode web server</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -402,6 +439,7 @@
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -411,6 +449,7 @@
The Kerberos keytab file with the credentials for the
HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -419,6 +458,7 @@
<description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -427,6 +467,7 @@
<description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -435,6 +476,7 @@
<description>
Combined keytab file containing the namenode service and host principals.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -443,13 +485,14 @@
<description>
The filename of the keytab file for the DataNode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.https-address</name>
<value>localhost:50470</value>
<description>The https address where namenode binds</description>
-
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -460,6 +503,7 @@
directories. The datanode will not come up if the permissions are
different on existing dfs.datanode.data.dir directories. If the directories
don't exist, they will be created with this permission.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -473,6 +517,7 @@
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -482,6 +527,7 @@
<name>dfs.cluster.administrators</name>
<value> hdfs</value>
<description>ACL for who all can view the default servlets in the HDFS</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<visible>true</visible>
</value-attributes>
@@ -495,6 +541,7 @@
heartbeat messages have not been received by the namenode for more than a
specified time interval.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.avoid.write.stale.datanode</name>
@@ -504,6 +551,7 @@
heartbeat messages have not been received by the namenode for more than a
specified time interval.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.write.stale.datanode.ratio</name>
@@ -511,11 +559,13 @@
<description>When the ratio of number stale datanodes to total datanodes marked is greater
than this ratio, stop avoiding writing to stale nodes so as to prevent causing hotspots.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.stale.datanode.interval</name>
<value>30000</value>
<description>Datanode is stale after not getting a heartbeat in this interval in ms</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -523,12 +573,14 @@
<value>0.0.0.0:8480</value>
<description>The address and port the JournalNode web UI listens on.
If the port is 0 then the server will start on a free port. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.journalnode.edits.dir</name>
<value>/grid/0/hdfs/journal</value>
<description>The path where the JournalNode daemon will store its local state. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- HDFS Short-Circuit Local Reads -->
@@ -538,6 +590,7 @@
<value>true</value>
<description>This configuration parameter turns on short-circuit local reads.</description>
<display-name>HDFS Short-circuit read</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -550,6 +603,7 @@
This is a path to a UNIX domain socket that will be used for communication between the DataNode and local HDFS clients.
If the string "_PORT" is present in this path, it will be replaced by the TCP port of the DataNode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -561,6 +615,7 @@
more file descriptors, but potentially provide better performance on
workloads involving lots of seeks.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -568,41 +623,49 @@
<value>true</value>
<description>Set to true to enable NameNode to attempt recovering a previously failed dfs.namenode.name.dir.
When enabled, a recovery of any failed directory is attempted during checkpoint.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.handler.count</name>
<value>40</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.acls.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.client.file-block-storage-locations.timeout.millis</name>
<value>3000</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.client.mmap.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.max.locked.memory</name>
<value>0</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.hdfs-blocks-metadata.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.http.policy</name>
<value>HTTP_ONLY</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -615,6 +678,7 @@
they are accumulated to exceed certain threshold (e.g., 1MB) in memory.
One needs to make sure the directory has enough space.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -624,12 +688,14 @@
<name>nfs.exports.allowed.hosts</name>
<value>* rw</value>
<display-name>Allowed hosts</display-name>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Property from HDP 2.3 stack for Ranger -->
<property>
<name>dfs.namenode.inode.attributes.provider.class</name>
<description>Enable ranger hdfs plugin</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>ranger-hdfs-plugin-properties</type>
@@ -645,6 +711,7 @@
<property>
<name>dfs.encryption.key.provider.uri</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -672,12 +739,14 @@
<name>dfs.content-summary.limit</name>
<value>5000</value>
<description>Dfs content summary limit.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.startup.delay.block.deletion.sec</name>
<value>3600</value>
<description></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/HDFS/configuration/ranger-hdfs-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-audit.xml
index 3f30839..a70f764 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-audit.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-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/hadoop/hdfs/audit/db/spool</value>
<description>/var/log/hadoop/hdfs/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/hadoop/hdfs/audit/hdfs/spool</value>
<description>/var/log/hadoop/hdfs/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/hadoop/hdfs/audit/solr/spool</value>
<description>/var/log/hadoop/hdfs/audit/solr/spool</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -169,6 +184,7 @@
<value>false</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/HDFS/configuration/ranger-hdfs-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
index 152c241..1ba60f6 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
@@ -26,12 +26,14 @@
<display-name>policy User for HDFS</display-name>
<description>This user must be system user and also present at Ranger
admin portal</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.rpc.protection</name>
<value></value>
<description>Used for repository creation on ranger admin
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -40,6 +42,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>
@@ -50,6 +53,7 @@
<value>No</value>
<display-name>Enable Ranger for HDFS</display-name>
<description>Enable ranger hdfs plugin</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>ranger-env</type>
@@ -68,11 +72,13 @@
<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>hadoop</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin
</description>
@@ -87,126 +93,151 @@
<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>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>
-->
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
index 2fd41d4..f681ad1 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
@@ -24,6 +24,7 @@
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/iop/current/hadoop-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/hadoop-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/HDFS/configuration/ranger-hdfs-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml
index ba46278..ff83f9c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml
@@ -23,42 +23,49 @@
<name>ranger.plugin.hdfs.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing Hdfs policies</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.plugin.hdfs.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.hdfs.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.hdfs.policy.rest.ssl.config.file</name>
<value>/etc/hadoop/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.hdfs.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.hdfs.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>
<name>xasecure.add-hadoop-authorization</name>
<value>true</value>
<description>Enable/Disable the default hadoop authorization (based on rwxrwxrwx permission on the resource) if Ranger Authorization fails.</description>
+ <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/HDFS/configuration/ssl-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml
index 4bc5ba5..11fa1e4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml
@@ -22,15 +22,18 @@
<name>ssl.client.truststore.location</name>
<value>/etc/security/clientKeys/all.jks</value>
<description>Location of the trust store file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.truststore.type</name>
<value>jks</value>
<description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.truststore.password</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password to open the trust store file.</description>
</property>
@@ -38,20 +41,24 @@
<name>ssl.client.truststore.reload.interval</name>
<value>10000</value>
<description>Truststore reload interval, in milliseconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.keystore.type</name>
<value>jks</value>
<description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.keystore.location</name>
<value>/etc/security/clientKeys/keystore.jks</value>
<description>Location of the keystore file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.client.keystore.password</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password to open the keystore file.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml
index 1a4cf77..b9e93ba 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml
@@ -22,15 +22,18 @@
<name>ssl.server.truststore.location</name>
<value>/etc/security/serverKeys/all.jks</value>
<description>Location of the trust store file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.truststore.type</name>
<value>jks</value>
<description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.truststore.password</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password to open the trust store file.</description>
</property>
@@ -38,26 +41,31 @@
<name>ssl.server.truststore.reload.interval</name>
<value>10000</value>
<description>Truststore reload interval, in milliseconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.keystore.type</name>
<value>jks</value>
<description>Optional. Default value is "jks".</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.keystore.location</name>
<value>/etc/security/serverKeys/keystore.jks</value>
<description>Location of the keystore file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ssl.server.keystore.password</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password to open the keystore file.</description>
</property>
<property>
<name>ssl.server.keystore.keypassword</name>
<value>bigdata</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password for private key in keystore file.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml
index 5f64adc..5f18fde 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml
@@ -52,6 +52,7 @@
USER={{hcat_user}}
METASTORE_PORT={{hive_metastore_port}}
</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/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml
index d69a98d..96880ec 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml
@@ -26,6 +26,7 @@
<value>1024</value>
<description>Hive Java heap size</description>
<display-name>HiveServer2 Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -42,6 +43,7 @@
<value>512</value>
<description>Hive Client Java heap size</description>
<display-name>Client Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -57,6 +59,7 @@
<value>1024</value>
<description>Hive Metastore Java heap size</description>
<display-name>Metastore Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -72,6 +75,7 @@
<value>mysql</value>
<display-name>Hive Database Type</display-name>
<description>Default HIVE DB type.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -83,6 +87,7 @@
<description>
Property that determines whether the HIVE DB is managed by Ambari.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -91,11 +96,13 @@
<name>hive_ambari_database</name>
<value>MySQL</value>
<description>Database type.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_database_name</name>
<value>hive</value>
<description>Database name.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>database</type>
<visible>false</visible>
@@ -108,6 +115,7 @@
<value>/var/log/hive</value>
<display-name>Hive Log Dir</display-name>
<description>Directory for Hive Log files.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -119,6 +127,7 @@
<value>/var/run/hive</value>
<display-name>Hive PID Dir</display-name>
<description>Hive PID Dir.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -129,6 +138,7 @@
<name>hive_user</name>
<display-name>Hive User</display-name>
<value>hive</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>Hive User.</description>
</property>
@@ -140,6 +150,7 @@
<value>/var/log/webhcat</value>
<display-name>WebHCat Log Dir</display-name>
<description>WebHCat Log Dir.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -151,6 +162,7 @@
<value>/var/run/webhcat</value>
<display-name>WebHCat Pid Dir</display-name>
<description>WebHCat Pid Dir.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -161,6 +173,7 @@
<name>hcat_user</name>
<display-name>HCat User</display-name>
<value>hcat</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>HCat User.</description>
</property>
@@ -168,6 +181,7 @@
<name>webhcat_user</name>
<display-name>WebHCat User</display-name>
<value>hcat</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>WebHCat User.</description>
</property>
@@ -176,12 +190,14 @@
<name>hive_user_nofile_limit</name>
<value>32000</value>
<description>Max open files limit setting for HIVE user.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_user_nproc_limit</name>
<value>16000</value>
<description>Max number of processes limit setting for HIVE user.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- hive-env.sh -->
@@ -257,12 +273,14 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{{jdbc_libs_dir}}"
export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}"
{% endif %}
</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_security_authorization</name>
<display-name>Choose Authorization</display-name>
<value>None</value>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>ranger-env</type>
@@ -292,6 +310,7 @@ export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}"
<name>hive_exec_orc_storage_strategy</name>
<display-name>ORC Storage Strategy</display-name>
<value>SPEED</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -312,6 +331,7 @@ export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}"
<name>hive_txn_acid</name>
<display-name>ACID Transactions</display-name>
<value>off</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml
index 8529016..3de8a20 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml
@@ -113,6 +113,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,RFA
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
</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/HIVE/configuration/hive-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml
index ec8426b..ba7032a 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml
@@ -131,6 +131,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,RFA
log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<show-property-name>false</show-property-name>
</value-attributes>
[06/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
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/_HOST@EXAMPLE.COM</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/_HOST@EXAMPLE.COM</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](.%admin@APACHE.ORG)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" ] && [ "$EUID" -eq 0 ] && [ -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>
[02/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-admin-site.xml
index 13aa9be..dcc652d 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-admin-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-admin-site.xml
@@ -22,6 +22,7 @@
<name>ranger.service.host</name>
<value>{{ranger_host}}</value>
<description>Host where ranger service to be installed</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -29,6 +30,7 @@
<display-name>HTTP enabled</display-name>
<value>true</value>
<description>Enable HTTP</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>boolean</type>
@@ -39,35 +41,41 @@
<name>ranger.service.http.port</name>
<value>6080</value>
<description>HTTP port</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.https.port</name>
<value>6182</value>
<description>HTTPS port (if SSL is enabled)</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.https.attrib.ssl.enabled</name>
<value>false</value>
<description>true/false, set to true if using SSL</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.https.attrib.clientAuth</name>
<value>want</value>
<description>Needs to be set to want for two way SSL</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.https.attrib.keystore.keyalias</name>
<value>rangeradmin</value>
<description>Alias for Ranger Admin key in keystore</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.https.attrib.keystore.pass</name>
<value>xasecure</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password for keystore</description>
</property>
@@ -76,6 +84,7 @@
<name>ranger.https.attrib.keystore.file</name>
<value>/etc/ranger/admin/conf/ranger-admin-keystore.jks</value>
<description>Ranger admin keystore (specify full path)</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -83,6 +92,7 @@
<value>{{ranger_external_url}}</value>
<description>URL to be used by clients to access ranger admin</description>
<display-name>External URL</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<visible>false</visible>
<overridable>false</overridable>
@@ -94,6 +104,7 @@
<value>com.mysql.jdbc.Driver</value>
<description>JDBC driver class name. Example: For Mysql: com.mysql.jdbc.Driver, For Oracle: oracle.jdbc.OracleDriver</description>
<display-name>Driver class name for a JDBC Ranger database</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -110,6 +121,7 @@
<display-name>JDBC connect string</display-name>
<value>jdbc:mysql://localhost</value>
<description>JDBC connect string - auto populated based on other values</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -133,11 +145,13 @@
<name>ranger.jpa.jdbc.user</name>
<value>{{ranger_db_user}}</value>
<description>JDBC user</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.jpa.jdbc.password</name>
<value>_</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>JDBC password</description>
</property>
@@ -146,18 +160,21 @@
<name>ranger.jpa.jdbc.credential.alias</name>
<value>rangeradmin</value>
<description>Alias name for storing JDBC password</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.credential.provider.path</name>
<value>/etc/ranger/admin/rangeradmin.jceks</value>
<description>File for credential store, provide full file path</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.audit.source.type</name>
<value>db</value>
<description>db or solr, based on the audit destination used</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- As currently not going to support Solr auditing, so commenting these properties.
@@ -165,6 +182,7 @@
<name>ranger.audit.solr.urls</name>
<value></value>
<description>Solr url for audit. Example: http://solr_host:6083/solr/ranger_audits</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -173,6 +191,7 @@
<value>UNIX</value>
<description>Ranger admin Authentication - UNIX/LDAP/AD/NONE</description>
<display-name>Authentication method</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -189,6 +208,7 @@
<display-name>LDAP URL</display-name>
<value>{{ranger_ug_ldap_url}}</value>
<description>LDAP Server URL, only used if Authentication method is LDAP</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -198,6 +218,7 @@
<name>ranger.ldap.user.dnpattern</name>
<value>uid={0},ou=users,dc=xasecure,dc=net</value>
<description>LDAP user DN, only used if Authentication method is LDAP</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -208,6 +229,7 @@
<display-name>Group Search Base</display-name>
<value>{{ranger_ug_ldap_group_searchbase}}</value>
<description>LDAP group searchbase, only used if Authentication method is LDAP</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -215,6 +237,7 @@
<display-name>Group Search Filter</display-name>
<value>{{ranger_ug_ldap_group_searchfilter}}</value>
<description>LDAP group search filter, only used if Authentication method is LDAP</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -222,6 +245,7 @@
<display-name>User Search Filter</display-name>
<value>{{ranger_ug_ldap_user_searchfilter}}</value>
<description>Search filter used for Bind Authentication</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -231,6 +255,7 @@
<name>ranger.ldap.group.roleattribute</name>
<value>cn</value>
<description>LDAP group role attribute, only used if Authentication method is LDAP</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -240,6 +265,7 @@
<name>ranger.ldap.base.dn</name>
<value>dc=example,dc=com</value>
<description>The Distinguished Name (DN) of the starting point for directory server searches.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -250,6 +276,7 @@
<display-name>Bind User</display-name>
<value>{{ranger_ug_ldap_bind_dn}}</value>
<description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users. </description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -259,6 +286,7 @@
<name>ranger.ldap.bind.password</name>
<display-name>Bind User Password</display-name>
<value>{{ranger_usersync_ldap_ldapbindpassword}}</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password for the account that can search for users</description>
<value-attributes>
@@ -270,6 +298,7 @@
<name>ranger.ldap.referral</name>
<value>ignore</value>
<description>Set to follow if multiple LDAP servers are configured to return continuation references for results. Set to ignore (default) if no referrals should be followed</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -280,7 +309,7 @@
<value>localhost</value>
<display-name>Domain Name (Only for AD)</display-name>
<description>AD domain, only used if Authentication method is AD</description>
- <description></description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -290,6 +319,7 @@
<name>ranger.ldap.ad.url</name>
<value>{{ranger_ug_ldap_url}}</value>
<description>AD URL, only used if Authentication method is AD</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -299,6 +329,7 @@
<name>ranger.ldap.ad.base.dn</name>
<value>dc=example,dc=com</value>
<description>The Distinguished Name (DN) of the starting point for directory server searches.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -308,6 +339,7 @@
<name>ranger.ldap.ad.bind.dn</name>
<value>{{ranger_ug_ldap_bind_dn}}</value>
<description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -316,6 +348,7 @@
<property>
<name>ranger.ldap.ad.bind.password</name>
<value>{{ranger_usersync_ldap_ldapbindpassword}}</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password for the account that can search for users</description>
<value-attributes>
@@ -327,6 +360,7 @@
<name>ranger.ldap.ad.user.searchfilter</name>
<value>{{ranger_ug_ldap_user_searchfilter}}</value>
<description>Search filter used for Bind Authentication</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -336,6 +370,7 @@
<name>ranger.ldap.ad.referral</name>
<value>ignore</value>
<description>"Set to follow if multiple LDAP servers are configured to return continuation references for results. Set to ignore (default) if no referrals should be followed"</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -345,23 +380,27 @@
<name>ranger.jpa.audit.jdbc.driver</name>
<value>{{ranger_jdbc_driver}}</value>
<description>JDBC driver class name - for audit DB</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.url</name>
<value>{{audit_jdbc_url}}</value>
<description>JDBC connect string - auto populated based on other values</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.user</name>
<value>{{ranger_audit_db_user}}</value>
<description>JDBC user - audit</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.password</name>
<value>_</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>JDBC password - audit</description>
</property>
@@ -370,6 +409,7 @@
<name>ranger.jpa.audit.jdbc.credential.alias</name>
<value>rangeraudit</value>
<description>Alias name for storing JDBC password - for audit user</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -377,6 +417,7 @@
<value>true</value>
<description>Remote login enabled? - only used if Authentication method is UNIX</description>
<display-name>Allow remote Login</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
<type>value-list</type>
@@ -399,6 +440,7 @@
<name>ranger.unixauth.service.hostname</name>
<value>{{ugsync_host}}</value>
<description>Host where unix authentication service is running - only used if Authentication method is UNIX</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -408,6 +450,7 @@
<name>ranger.unixauth.service.port</name>
<value>5151</value>
<description>Port for unix authentication service - only used if Authentication method is UNIX</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -418,18 +461,21 @@
<name>ranger.jpa.jdbc.dialect</name>
<value>{{jdbc_dialect}}</value>
<description>JDBC dialect used for policy DB</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.dialect</name>
<value>{{jdbc_dialect}}</value>
<description>JDBC dialect used for audit DB</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- As currently not going to support Solr auditing, so commenting these properties.
<property>
<name>ranger.audit.solr.zookeepers</name>
<value>NONE</value>
<description>Solr Zookeeper string</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>zoo.cfg</type>
@@ -446,11 +492,13 @@
<name>ranger.audit.solr.username</name>
<value>ranger_solr</value>
<description>Solr username</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.audit.solr.password</name>
<value>NONE</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Solr password</description>
</property>
@@ -461,6 +509,7 @@
<value></value>
<display-name>SSO provider url</display-name>
<description>Example: https://KNOX_HOST:KNOX_PORT/gateway/TOPOLOGY_NAME/knoxsso/api/v1/websso</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -471,6 +520,7 @@
<value></value>
<display-name>SSO public key</display-name>
<description>Public key for SSO cookie verification</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>multiLine</type>
<empty-value-valid>true</empty-value-valid>
@@ -482,6 +532,7 @@
<value>hadoop-jwt</value>
<display-name>SSO cookiename</display-name>
<description>Parameter name for SSO cookie</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -492,6 +543,7 @@
<value>false</value>
<display-name>Enable Ranger SSO</display-name>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -499,6 +551,7 @@
<value>originalUrl</value>
<display-name>SSO query param originalurl</display-name>
<description>Query name for appending original url in SSO url</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -509,6 +562,7 @@
<value>Mozilla,chrome</value>
<display-name>SSO browser useragent</display-name>
<description>Comma seperated browser agent</description>
+ <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/RANGER/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-env.xml
index 6427530..9d7e385 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-env.xml
@@ -24,6 +24,7 @@
<name>ranger_user</name>
<display-name>Ranger User</display-name>
<value>ranger</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>Ranger username</description>
<value-attributes>
@@ -35,6 +36,7 @@
<name>ranger_group</name>
<display-name>Ranger Group</display-name>
<value>ranger</value>
+ <on-ambari-upgrade add="true"/>
<property-type>GROUP</property-type>
<description>Ranger group</description>
<value-attributes>
@@ -46,17 +48,20 @@
<name>ranger_admin_log_dir</name>
<value>/var/log/ranger/admin</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger_usersync_log_dir</name>
<value>/var/log/ranger/usersync</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger_admin_username</name>
<value>amb_ranger_admin</value>
+ <on-ambari-upgrade add="true"/>
<property-type>TEXT</property-type>
<display-name>Ranger Admin username for Ambari</display-name>
<description>This is the ambari user created for creating repositories and policies in Ranger Admin for each plugin</description>
@@ -66,6 +71,7 @@
<name>ranger_admin_password</name>
<display-name>Ranger Admin user's password for Ambari</display-name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>This is the ambari user password created for creating repositories and policies in Ranger Admin for each plugin</description>
<value-attributes>
@@ -77,11 +83,13 @@
<name>admin_username</name>
<value>admin</value>
<description>This is the username for default admin user that is used for creating ambari user in Ranger Admin</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>admin_password</name>
<value>admin</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>This is the password for default admin user that is used for creating ambari user in Ranger Admin</description>
</property>
@@ -90,6 +98,7 @@
<name>ranger_pid_dir</name>
<value>/var/run/ranger</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -97,6 +106,7 @@
<value>No</value>
<display-name>HDFS Ranger Plugin</display-name>
<description>Enable HDFS Ranger plugin</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -119,6 +129,7 @@
<value>No</value>
<display-name>YARN Ranger Plugin</display-name>
<description>Enable YARN Ranger plugin</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -141,6 +152,7 @@
<value>No</value>
<display-name>Hive Ranger Plugin</display-name>
<description>Enable Hive Ranger plugin</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -163,6 +175,7 @@
<value>No</value>
<display-name>Hbase Ranger Plugin</display-name>
<description>Enable HBase Ranger plugin</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -185,6 +198,7 @@
<value>No</value>
<display-name>Knox Ranger Plugin</display-name>
<description>Enable Knox Ranger plugin</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -208,6 +222,7 @@
<value>No</value>
<display-name>Storm Ranger Plugin</display-name>
<description>Enable Storm Ranger plugin</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -230,6 +245,7 @@
<value>No</value>
<display-name>Kafka Ranger Plugin</display-name>
<description>Enable Kafka Ranger plugin</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -268,6 +284,7 @@
<selection-cardinality>1</selection-cardinality>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -275,6 +292,7 @@
<value>true</value>
<display-name>Audit to HDFS</display-name>
<description>Enable Audit to HDFS for all ranger supported services. This property is overridable at service level</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -303,6 +321,7 @@
<name>fs.defaultFS</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -325,6 +344,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Removing auditing to Solr
@@ -333,6 +353,7 @@
<value>true</value>
<display-name>Audit to Solr</display-name>
<description>Enable Audit to Solr for all ranger supported services. This property is overridable at service level</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -355,6 +376,7 @@
<display-name>SolrCloud</display-name>
<description>SolrCloud uses zookeeper for distributed search and indexing</description>
<value>false</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<overridable>false</overridable>
@@ -378,6 +400,7 @@
<property>
<name>oracle_home</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -385,12 +408,14 @@
<name>xml_configurations_supported</name>
<value>true</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger_pid_dir</name>
<value>/var/run/ranger</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -398,6 +423,7 @@
<display-name>Setup Database and Database User</display-name>
<value>true</value>
<description>If set to Yes, Ambari will create and setup Ranger Database and Database User. This will require to specify Database Admin user and password</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<overridable>false</overridable>
@@ -433,6 +459,7 @@
<name>db_host</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-site.xml
index f9e7331..825fc3e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-site.xml
@@ -33,37 +33,44 @@
<property>
<name>http.service.port</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>https.service.port</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>https.attrib.keystoreFile</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>https.attrib.keystorePass</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>https.attrib.keyAlias</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>https.attrib.clientAuth</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>http.enabled</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/RANGER/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-ugsync-site.xml
index ffc26e8..2a39e27 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/ranger-ugsync-site.xml
@@ -22,23 +22,27 @@
<name>ranger.usersync.port</name>
<value>5151</value>
<description>Port for unix authentication service, run within usersync</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.ssl</name>
<value>true</value>
<description>SSL enabled? (ranger admin -> usersync communication)</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.keystore.file</name>
<value>/usr/iop/current/ranger-usersync/conf/unixauthservice.jks</value>
<description>Keystore file used for usersync</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.keystore.password</name>
<value>UnIx529p</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Keystore password</description>
</property>
@@ -47,11 +51,13 @@
<name>ranger.usersync.truststore.file</name>
<value>/usr/iop/current/ranger-usersync/conf/mytruststore.jks</value>
<description>Truststore used for usersync, required if usersync -> ranger admin communication is SSL enabled</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.truststore.password</name>
<value>changeit</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Truststore password</description>
</property>
@@ -60,6 +66,7 @@
<name>ranger.usersync.passwordvalidator.path</name>
<value>./native/credValidator.uexe</value>
<description>Native program for password validation</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -67,6 +74,7 @@
<display-name>Enable User Sync</display-name>
<value>true</value>
<description>Should users and groups be synchronized to Ranger Database? Required to setup Ranger policies</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
<type>value-list</type>
@@ -89,24 +97,28 @@
<name>ranger.usersync.sink.impl.class</name>
<value>org.apache.ranger.unixusersync.process.PolicyMgrUserGroupBuilder</value>
<description>Class to be used as sink (to sync users into ranger admin)</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.policymanager.baseURL</name>
<value>{{ranger_external_url}}</value>
<description>URL to be used by clients to access ranger admin, use FQDN</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.policymanager.maxrecordsperapicall</name>
<value>1000</value>
<description>How many records to be returned per API call</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.policymanager.mockrun</name>
<value>false</value>
<description>Is user sync doing mock run?</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -114,6 +126,7 @@
<display-name>Minimum User ID</display-name>
<value>500</value>
<description>Only sync users above this user id (applicable for UNIX)</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -121,6 +134,7 @@
<display-name>Group File</display-name>
<value>/etc/group</value>
<description>Location of the groups file on the linux server</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -128,12 +142,14 @@
<display-name>Password File</display-name>
<value>/etc/passwd</value>
<description>Location of the password file on the linux server</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.sleeptimeinmillisbetweensynccycle</name>
<value>60000</value>
<description>Sleeptime interval in milliseconds, if < 1000 then default to 30 sec</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -141,6 +157,7 @@
<value>org.apache.ranger.unixusersync.process.UnixUserGroupBuilder</value>
<display-name>Sync Source</display-name>
<description>For Ldap: org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder, For Unix: org.apache.ranger.unixusersync.process.UnixUserGroupBuilder, org.apache.ranger.unixusersync.process.FileSourceUserGroupBuilder</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<empty-value-valid>true</empty-value-valid>
@@ -168,6 +185,7 @@
<display-name>File Name</display-name>
<value>/tmp/usergroup.txt</value>
<description>Path to the file with the users and groups information. Example: /tmp/usergroup.json or /tmp/usergroup.csv or /tmp/usergroup.txt</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -175,6 +193,7 @@
<display-name>Delimiter</display-name>
<value>,</value>
<description>Delimiter used in file, if File based user sync is used</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -182,6 +201,7 @@
<display-name>LDAP/AD URL</display-name>
<value>ldap://localhost:389</value>
<description>LDAP server URL. Example: value = ldap://localhost:389 or ldaps//localhost:636</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -189,12 +209,14 @@
<display-name>Bind User</display-name>
<value>cn=admin,dc=xasecure,dc=net</value>
<description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search for users. This user is used for searching the users. This could be read-only LDAP user. Example: cn=admin,dc=example,dc=com</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.ldap.ldapbindpassword</name>
<display-name>Bind User Password</display-name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>Password for the LDAP bind user used for searching users.</description>
</property>
@@ -203,12 +225,14 @@
<name>ranger.usersync.ldap.bindalias</name>
<value>testldapalias</value>
<description>Set as ranger.usersync.ldap.bindalias (string as is)</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.ldap.bindkeystore</name>
<value></value>
<description>Set same value as ranger.usersync.keystore.file property i.e default value /usr/hdp/current/ranger-usersync/conf/ugsync.jceks</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -220,6 +244,7 @@
<description>"# search base for users and groups
# sample value would be dc=hadoop,dc=apache,dc=org"
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -233,6 +258,7 @@
# sample value would be ou=users,dc=hadoop,dc=apache,dc=org
# overrides value specified in ranger.usersync.ldap.searchBase"
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -243,6 +269,7 @@
# please customize the value to suit your deployment
# default value: sub"
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -250,6 +277,7 @@
<display-name>User Object Class</display-name>
<value>person</value>
<description>LDAP User Object Class. Example: person or user</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -261,6 +289,7 @@
# please customize the value to suit your deployment
# default value is empty"
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -271,12 +300,14 @@
<display-name>Username Attribute</display-name>
<value></value>
<description>LDAP user name attribute. Example: sAMAccountName in AD, uid or cn in OpenLDAP</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.ldap.referral</name>
<value>ignore</value>
<description>Set to follow if multiple LDAP servers are configured to return continuation references for results. Set to ignore (default) if no referrals should be followed</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -287,24 +318,28 @@
<display-name>User Group Name Attribute</display-name>
<value>memberof, ismemberof</value>
<description>LDAP user group name attribute. Generally it is the same as username attribute. Example: sAMAccountName in AD, uid or cn in OpenLDAP</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.ldap.username.caseconversion</name>
<value>lower</value>
<description>User name case conversion</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.ldap.groupname.caseconversion</name>
<value>lower</value>
<description>Group name case conversion</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.logdir</name>
<value>/var/log/ranger/usersync</value>
<description>User sync log directory</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -316,6 +351,7 @@
# any value other than true would be treated as false
# default value: false"
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
<type>value-list</type>
@@ -339,6 +375,7 @@
<value>true</value>
<display-name>Group User Map Sync</display-name>
<description>Sync specific groups for users?</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
<type>value-list</type>
@@ -367,6 +404,7 @@
# if a value is not specified, takes the value of ranger.usersync.ldap.searchBase
# if ranger.usersync.ldap.searchBase is also not specified, takes the value of ranger.usersync.ldap.user.searchbase"
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -376,6 +414,7 @@
# please customize the value to suit your deployment
# default value: sub"
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -386,6 +425,7 @@
<display-name>Group Object Class</display-name>
<value> </value>
<description>LDAP Group object class. Example: group</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -397,6 +437,7 @@
# please customize the value to suit your deployment
# default value is empty"
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -404,6 +445,7 @@
<display-name>Group Name Attribute</display-name>
<value> </value>
<description>LDAP group name attribute. Example: cn</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -411,12 +453,14 @@
<display-name>Group Member Attribute</display-name>
<value> </value>
<description>LDAP group member attribute name. Example: member</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.pagedresultsenabled</name>
<value>true</value>
<description>Results can be paged?</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
<type>value-list</type>
@@ -439,12 +483,14 @@
<name>ranger.usersync.pagedresultssize</name>
<value>500</value>
<description>Page size</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.usersync.credstore.filename</name>
<value>/usr/iop/current/ranger-usersync/conf/ugsync.jceks</value>
<description>Credential store file name for user sync, specify full path</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/RANGER/configuration/usersync-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/usersync-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/usersync-properties.xml
index 5aa0698..ad494a6 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/usersync-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/usersync-properties.xml
@@ -33,52 +33,64 @@
<property>
<name>SYNC_SOURCE</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>MIN_UNIX_USER_ID_TO_SYNC</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>SYNC_INTERVAL</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_URL</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_BIND_DN</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_BIND_PASSWORD</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>CRED_KEYSTORE_FILENAME</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_BASE</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_SCOPE</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_USER_OBJECT_CLASS</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_FILTER</name>
<display-name>User Search Filter</display-name>
<value></value>
<description>default value is empty</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -87,23 +99,28 @@
<property>
<name>SYNC_LDAP_USER_NAME_ATTRIBUTE</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_USERNAME_CASE_CONVERSION</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SYNC_LDAP_GROUPNAME_CASE_CONVERSION</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>logdir</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/RANGER_KMS/configuration/dbks-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/dbks-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/dbks-site.xml
index d2839f0..5a007d2 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/dbks-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/dbks-site.xml
@@ -25,66 +25,77 @@
<name>hadoop.kms.blacklist.DECRYPT_EEK</name>
<value>hdfs</value>
<description>Blacklist for decrypt EncryptedKey CryptoExtension operations</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.db.encrypt.key.password</name>
<value>_</value>
<description>Password used for encrypting Master Key</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.url</name>
<value>{{db_jdbc_url}}</value>
<description>URL for Database</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.user</name>
<value>{{db_user}}</value>
<description>Database username used for operation</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.password</name>
<value>_</value>
<description>Database user's password</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.credential.provider.path</name>
<value>/etc/ranger/kms/rangerkms.jceks</value>
<description>Credential provider path</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.credential.alias</name>
<value>ranger.ks.jdbc.password</value>
<description>Credential alias used for password</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.masterkey.credential.alias</name>
<value>ranger.ks.masterkey.password</value>
<description>Credential alias used for masterkey</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.dialect</name>
<value>{{jdbc_dialect}}</value>
<description>Dialect used for database</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.driver</name>
<value>{{db_jdbc_driver}}</value>
<description>Driver used for database</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.ks.jdbc.sqlconnectorjar</name>
<value>{{driver_curl_target}}</value>
<description>Driver used for database</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/RANGER_KMS/configuration/kms-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-env.xml
index 47bb35f..14e29b4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-env.xml
@@ -24,6 +24,7 @@
<name>kms_user</name>
<display-name>Kms User</display-name>
<value>kms</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>Kms username</description>
</property>
@@ -32,6 +33,7 @@
<name>kms_group</name>
<display-name>Kms group</display-name>
<value>kms</value>
+ <on-ambari-upgrade add="true"/>
<property-type>GROUP</property-type>
<description>Kms group</description>
</property>
@@ -40,12 +42,14 @@
<name>kms_log_dir</name>
<value>/var/log/ranger/kms</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kms_port</name>
<value>9292</value>
<description></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/RANGER_KMS/configuration/kms-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-log4j.xml
index 8d7b8d3..a5add37 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-log4j.xml
@@ -63,6 +63,7 @@ log4j.logger.org.apache.hadoop.conf=ERROR
log4j.logger.org.apache.hadoop=INFO
log4j.logger.com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGenerator=OFF
</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.2/services/RANGER_KMS/configuration/kms-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-properties.xml
index 3bc8f00..593fd4e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-properties.xml
@@ -24,11 +24,13 @@
<name>REPOSITORY_CONFIG_USERNAME</name>
<value>keyadmin</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
<value>keyadmin</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description></description>
</property>
@@ -37,23 +39,27 @@
<name>DB_FLAVOR</name>
<value>MYSQL</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>SQL_CONNECTOR_JAR</name>
<value>/usr/share/java/mysql-connector-java.jar</value>
<description>Location of DB client library (please check the location of the jar file)</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>db_root_user</name>
<value>root</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>db_root_password</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description></description>
</property>
@@ -62,23 +68,27 @@
<name>db_host</name>
<value>localhost</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>db_name</name>
<value>rangerkms</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>db_user</name>
<value>rangerkms</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>db_password</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description></description>
</property>
@@ -86,6 +96,7 @@
<property>
<name>KMS_MASTER_KEY_PASSWD</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-site.xml
index f911104..415ef44 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/kms-site.xml
@@ -24,12 +24,14 @@
<name>hadoop.kms.key.provider.uri</name>
<value>dbks://http@localhost:9292/kms</value>
<description>URI of the backing KeyProvider for the KMS.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>hadoop.security.keystore.JavaKeyStoreProvider.password</name>
<value>none</value>
<description>If using the JavaKeyStoreProvider, the password for the keystore file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -37,6 +39,7 @@
<value>true</value>
<description>Whether the KMS will act as a cache for the backing KeyProvider. When the cache is enabled, operations like getKeyVersion, getMetadata, and getCurrentKey will sometimes return cached data without consulting the backing KeyProvider. Cached values are flushed when keys are deleted or modified.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -44,18 +47,21 @@
<value>600000</value>
<description>Expiry time for the KMS key version and key metadata cache, in milliseconds. This affects getKeyVersion and getMetadata.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.current.key.cache.timeout.ms</name>
<value>30000</value>
<description>Expiry time for the KMS current key cache, in milliseconds. This affects getCurrentKey operations.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.audit.aggregation.window.ms</name>
<value>10000</value>
<description>Duplicate audit log events within the aggregation window (specified in ms) are quashed to reduce log traffic. A single message for aggregated events is printed at the end of the window, along with a count of the number of aggregated events.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -63,24 +69,28 @@
<value>simple</value>
<description>Authentication type for the KMS. Can be either "simple" or "kerberos".
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.authentication.kerberos.keytab</name>
<value>${user.home}/kms.keytab</value>
<description>Path to the keytab with credentials for the configured Kerberos principal.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.authentication.kerberos.principal</name>
<value>HTTP/localhost</value>
<description>The Kerberos principal to use for the HTTP endpoint. The principal must start with 'HTTP/' as per the Kerberos HTTP SPNEGO specification.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.authentication.kerberos.name.rules</name>
<value>DEFAULT</value>
<description>Rules used to resolve Kerberos principal names.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -88,42 +98,49 @@
<value>random</value>
<description>Indicates how the secret to sign the authentication cookies will be stored. Options are 'random' (default), 'string' and 'zookeeper'. If using a setup with multiple KMS instances, 'zookeeper' should be used.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.path</name>
<value>/hadoop-kms/hadoop-auth-signature-secret</value>
<description>The Zookeeper ZNode path where the KMS instances will store and retrieve the secret from.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.connection.string</name>
<value>#HOSTNAME#:#PORT#,...</value>
<description>The Zookeeper connection string, a list of hostnames and port comma separated.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.auth.type</name>
<value>kerberos</value>
<description>The Zookeeper authentication type, 'none' or 'sasl' (Kerberos).</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.keytab</name>
<value>/etc/hadoop/conf/kms.keytab</value>
<description>The absolute path for the Kerberos keytab with the credentials to connect to Zookeeper.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal</name>
<value>kms/#HOSTNAME#</value>
<description>The Kerberos service principal used to connect to Zookeeper.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.kms.security.authorization.manager</name>
<value>org.apache.ranger.authorization.kms.authorizer.RangerKmsAuthorizer</value>
<description></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/RANGER_KMS/configuration/ranger-kms-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-audit.xml
index ad24a34..c286b7c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-audit.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-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>
@@ -40,36 +42,42 @@
<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>
<description>Audit DB JDBC Password</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<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/ranger/kms/audit/db/spool</value>
<description>/var/log/ranger/kms/audit/db/spool</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -77,6 +85,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>
@@ -86,12 +95,14 @@
<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"/>
</property>
<property>
<name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
<value>/var/log/ranger/kms/audit/hdfs/spool</value>
<description>/var/log/ranger/kms/audit/hdfs/spool</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Removing auditing to Solr
@@ -100,6 +111,7 @@
<value>true</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>
@@ -109,18 +121,21 @@
<name>xasecure.audit.destination.solr.urls</name>
<value>{{ranger_audit_solr_urls}}</value>
<description>Solr URL</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.audit.destination.solr.zookeepers</name>
<value>none</value>
<description>Solr Zookeeper string</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.audit.destination.solr.batch.filespool.dir</name>
<value>/var/log/ranger/kms/audit/solr/spool</value>
<description>/var/log/ranger/kms/audit/solr/spool</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -129,6 +144,7 @@
<value>false</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/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml
index e870ea3..ced2af7 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml
@@ -24,11 +24,13 @@
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/iop/current/ranger-kms/conf/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.keystore.password</name>
<value>myKeyFilePassword</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<value-attributes>
<type>password</type>
@@ -40,11 +42,13 @@
<name>xasecure.policymgr.clientssl.truststore</name>
<value>/usr/iop/current/ranger-kms/conf/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.password</name>
<value>changeit</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<value-attributes>
<type>password</type>
@@ -56,12 +60,14 @@
<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/RANGER_KMS/configuration/ranger-kms-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-security.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-security.xml
index b735995..e9eb524 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-security.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-security.xml
@@ -24,36 +24,42 @@
<name>ranger.plugin.kms.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this kms instance</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.plugin.kms.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.kms.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.kms.policy.rest.ssl.config.file</name>
<value>/etc/ranger/kms/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.kms.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.kms.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>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-site.xml
index 2767243..054531f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER_KMS/configuration/ranger-kms-site.xml
@@ -23,37 +23,44 @@
<property>
<name>ranger.service.host</name>
<value>{{kms_host}}</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.http.port</name>
<value>{{kms_port}}</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.https.port</name>
<value>9393</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.shutdown.port</name>
<value>7085</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.contextName</name>
<value>/kms</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xa.webapp.dir</name>
<value>./webapp</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.service.https.attrib.ssl.enabled</name>
<value>false</value>
<description></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/SLIDER/configuration/slider-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-client.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-client.xml
index 95e0c10..878bc8a 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-client.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/SLIDER/configuration/slider-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-env.xml
index 03afb41..b84b2b1 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/SLIDER/configuration/slider-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-log4j.xml
index 3caf64f..76f16cd 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SLIDER/configuration/slider-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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"/>
<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/SOLR/configuration/solr-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-env.xml
index 736cb3f..370cef4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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_data_dir</name>
<value>/opt/solr/data</value>
<description>Solr Home 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,12 +48,14 @@
<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>
<name>solr_xms_minmem</name>
<value>512</value>
<description>Set Xms value for Solr in MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -61,6 +69,7 @@
<name>solr_xmx_maxmem</name>
<value>512</value>
<description>Set Xmx value for Solr in MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>{{solr_xms_minmem}}</minimum>
@@ -229,6 +238,7 @@ SOLR_OPTS="-Dsolr.directoryFactory=HdfsDirectoryFactory \
-Dsolr.log4j.dir={{log_dir}}"
</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/SOLR/configuration/solr-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-log4j.xml
index e138d1a..c90f9d0 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/SOLR/configuration/solr-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-site.xml
index c794e86..219b7a0 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SOLR/configuration/solr-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/SPARK/configuration/spark-defaults.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-defaults.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-defaults.xml
index d46ba48..3d35aab 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-defaults.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2.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.2/services/SPARK/configuration/spark-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-env.xml
index 6dc3781..993820d 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-env.xml
@@ -28,11 +28,13 @@
<description>
TCP port number to listen on, default 10015.
</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 -->
@@ -109,6 +114,7 @@ export SPARK_YARN_USER_ENV="JAVA_LIBRARY_PATH=$JAVA_LIBRARY_PATH,LD_LIBRARY_PATH
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.2/services/SPARK/configuration/spark-javaopts-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-javaopts-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-javaopts-properties.xml
index f43a74d..77a7282 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-javaopts-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/SPARK/configuration/spark-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-log4j.xml
index e1c4d24..66b8678 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/SPARK/configuration/spark-metrics-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-metrics-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-metrics-properties.xml
index 8a6ef8f..e36f343 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SPARK/configuration/spark-metrics-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/SQOOP/configuration/sqoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SQOOP/configuration/sqoop-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SQOOP/configuration/sqoop-env.xml
index 06c9544..1eed273 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/SQOOP/configuration/sqoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/TITAN/configuration/titan-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-env.xml
index 86e09f1..4f80ea1 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/TITAN/configuration/titan-env.xml
@@ -25,6 +25,7 @@
<property>
<name>titan_user</name>
<description>User to run Titan as</description>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<value>titan</value>
</property>
@@ -41,6 +42,7 @@ export HADOOP_CONF_DIR={{hadoop_config_dir}}
export HBASE_CONF_DIR={{hbase_config_dir}}
CLASSPATH=$HADOOP_CONF_DIR:$HBASE_CONF_DIR:$CLASSPATH
</value>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
[07/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
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-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml
index 4f39d21..cfb5c01 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml
@@ -32,6 +32,7 @@
By default, gives each merge stream 1MB, which should minimize seeks.
</description>
<display-name>Sort Allocation Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -57,6 +58,7 @@
is already in progress, so spills may be larger than this threshold when
it is set to less than .5
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -66,6 +68,7 @@
The number of streams to merge at once while sorting files.
This determines the number of open file handles.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- map/reduce properties -->
@@ -75,6 +78,7 @@
<description>
Administrators for MapReduce applications.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -84,6 +88,7 @@
The default number of parallel transfers run by reduce during
the copy(shuffle) phase.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -93,6 +98,7 @@
If true, then multiple instances of some map tasks
may be executed in parallel.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -102,6 +108,7 @@
If true, then multiple instances of some reduce tasks may be
executed in parallel.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -111,6 +118,7 @@
Fraction of the number of maps in the job which should be complete before
reduces are scheduled for the job.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -119,6 +127,7 @@
<description>
Limit on the number of counters allowed per job.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -130,6 +139,7 @@
storing in-memory map outputs, as defined by
mapreduce.reduce.shuffle.input.buffer.percent.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -139,6 +149,7 @@
The percentage of memory to be allocated from the maximum heap
size to storing map outputs during the shuffle.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -148,6 +159,7 @@
If the job outputs are to compressed as SequenceFiles, how should
they be compressed? Should be one of NONE, RECORD or BLOCK.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -159,6 +171,7 @@
remaining map outputs in memory must consume less than this threshold before
the reduce can begin.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- copied from kryptonite configuration -->
@@ -168,6 +181,7 @@
<description>
Should the outputs of the maps be compressed before being sent across the network. Uses SequenceFile compression.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -178,6 +192,7 @@
terminated if it neither reads an input, writes an output, nor
updates its status string.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -185,6 +200,7 @@
<value>1024</value>
<description>Virtual memory for single Map task</description>
<display-name>Map Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -209,6 +225,7 @@
<value>1024</value>
<description>Virtual memory for single Reduce task</description>
<display-name>Reduce Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -236,6 +253,7 @@
ShuffleHandler is a service run at the NodeManager to facilitate
transfers of intermediate Map outputs to requesting Reducers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -244,6 +262,7 @@
<description>
Directory where history files are written by MapReduce jobs.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -252,18 +271,21 @@
<description>
Directory where history files are managed by the MR JobHistory Server.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.address</name>
<value>localhost:10020</value>
<description>Enter your JobHistoryServer hostname.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.webapp.address</name>
<value>localhost:19888</value>
<description>Enter your JobHistoryServer hostname.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -273,6 +295,7 @@
The runtime framework for executing MapReduce jobs. Can be one of local,
classic or yarn.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -281,6 +304,7 @@
<description>
The staging dir used while submitting jobs.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -288,6 +312,7 @@
<value>512</value>
<description>The amount of memory the MR AppMaster needs.</description>
<display-name>AppMaster Memory</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -324,6 +349,7 @@
mapreduce.reduce.env config settings.
</description>
<display-name>MR AppMaster Java Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>mapred-site</type>
@@ -346,6 +372,7 @@
mapreduce.reduce.env config settings.
</description>
<display-name>MR AppMaster Java Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>mapred-site</type>
@@ -358,18 +385,21 @@
<name>yarn.app.mapreduce.am.log.level</name>
<value>INFO</value>
<description>MR App Master process log level.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.admin.map.child.java.opts</name>
<value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN -Diop.version=${iop.version}</value>
<description>This property stores Java options for map tasks.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.admin.reduce.child.java.opts</name>
<value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN -Diop.version=${iop.version}</value>
<description>This property stores Java options for reduce tasks.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -379,12 +409,14 @@
CLASSPATH for MR applications. A comma-separated list of CLASSPATH
entries.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.application.framework.path</name>
<value>/iop/apps/${iop.version}/mapreduce/mapreduce.tar.gz#mr-framework</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -397,6 +429,7 @@
set by resourcemanager. Otherwise, it will be override. The default number is
set to 2, to allow at least one retry for AM.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -408,6 +441,7 @@
Larger heap-size for child jvms of maps.
</description>
<display-name>MR Map Java Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>mapred-site</type>
@@ -424,6 +458,7 @@
Larger heap-size for child jvms of reduces.
</description>
<display-name>MR Reduce Java Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>mapred-site</type>
@@ -439,6 +474,7 @@
The logging level for the map task. The allowed levels are:
OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -448,6 +484,7 @@
The logging level for the reduce task. The allowed levels are:
OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -458,6 +495,7 @@
This is not an additive property. You must preserve the original value if
you want your map and reduce tasks to have access to native libraries (compression, etc)
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -466,6 +504,7 @@
<description>
User added environment variables for the MR App Master processes.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -474,6 +513,7 @@
<description>
Should the job outputs be compressed?
</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/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml
index 35404c6..513c8bd 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml
@@ -23,6 +23,7 @@
<description>
Maximum number of applications that can be pending and running.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -33,6 +34,7 @@
application masters i.e. controls number of concurrent running
applications.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -41,6 +43,7 @@
<description>
The queues at the this level (root is the root queue).
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -52,12 +55,14 @@
The child queues capacity should add up to their parent queue's capacity
or less.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.default.capacity</name>
<value>100</value>
<description>Default queue target capacity.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -66,6 +71,7 @@
<description>
Default queue user limit a percentage from 0.0 to 1.0.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -74,6 +80,7 @@
<description>
The maximum capacity of the default queue.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -82,6 +89,7 @@
<description>
The state of the default queue. State can be one of RUNNING or STOPPED.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -90,6 +98,7 @@
<description>
The ACL of who can submit jobs to the default queue.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -98,6 +107,7 @@
<description>
The ACL of who can administer jobs on the default queue.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -107,6 +117,7 @@
The ACL for who can administer this queue i.e. change sub-queue
allocations.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -118,6 +129,7 @@
Typically this should be set to number of nodes in the cluster, By default is setting
approximately number of nodes in one rack which is 40.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -126,12 +138,14 @@
<description>
Default minimum queue resource limit depends on the number of users who have submitted applications.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.scheduler.capacity.resource-calculator</name>
<value>org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator</value>
<display-name>CPU Scheduling</display-name>
+ <on-ambari-upgrade add="false"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -152,6 +166,7 @@
<name>yarn.scheduler.capacity.root.accessible-node-labels</name>
<value>*</value>
<description></description>
+ <on-ambari-upgrade add="false"/>
</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/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml
index 95372fb..956fa42 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml
@@ -26,6 +26,7 @@
<display-name>YARN Log Dir Prefix</display-name>
<value>/var/log/hadoop-yarn</value>
<description>YARN Log Dir Prefix</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -37,6 +38,7 @@
<display-name>YARN PID Dir Prefix</display-name>
<value>/var/run/hadoop-yarn</value>
<description>YARN PID Dir Prefix</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<overridable>false</overridable>
@@ -46,6 +48,7 @@
<property>
<name>yarn_user</name>
<value>yarn</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>YARN User</description>
</property>
@@ -54,6 +57,7 @@
<display-name>YARN Java heap size</display-name>
<value>1024</value>
<description>Max heapsize for all YARN components using a numerical value in the scale of MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -64,6 +68,7 @@
<display-name>ResourceManager Java heap size</display-name>
<value>1024</value>
<description>Max heapsize for ResourceManager using a numerical value in the scale of MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -75,6 +80,7 @@
<display-name>NodeManager Java heap size</display-name>
<value>1024</value>
<description>Max heapsize for NodeManager using a numerical value in the scale of MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -85,6 +91,7 @@
<display-name>Minimum user ID for submitting job</display-name>
<value>1000</value>
<description>Set to 0 to disallow root from submitting jobs. Set to 1000 to disallow all superusers from submitting jobs</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -94,6 +101,7 @@
<display-name>AppTimelineServer Java heap size</display-name>
<value>1024</value>
<description>Max heapsize for AppTimelineServer using a numerical value in the scale of MB</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<unit>MB</unit>
@@ -106,6 +114,7 @@
<value>false</value>
<description>You can use CGroups to isolate CPU-heavy processes in a Hadoop cluster.</description>
<display-name>CPU Isolation</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -238,6 +247,7 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
fi
YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE"
</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/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml
index 8c44b9e..8e50a62 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml
@@ -66,6 +66,7 @@ log4j.appender.JSA.layout=org.apache.log4j.PatternLayout
log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=${yarn.server.resourcemanager.appsummary.logger}
log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=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/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml
index 397f96f..93ab51e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml
@@ -27,18 +27,21 @@
<name>yarn.resourcemanager.hostname</name>
<value>localhost</value>
<description>The hostname of the RM.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.resourcemanager.resource-tracker.address</name>
<value>localhost:8025</value>
<description> The address of ResourceManager. </description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.resourcemanager.scheduler.address</name>
<value>localhost:8030</value>
<description>The address of the scheduler interface.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -48,18 +51,21 @@
The address of the applications manager interface in the
RM.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.resourcemanager.admin.address</name>
<value>localhost:8141</value>
<description>The address of the RM admin interface.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>yarn.resourcemanager.scheduler.class</name>
<value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value>
<description>The class to use as the resource scheduler.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -71,6 +77,7 @@
and the specified value will get allocated at minimum.
</description>
<display-name>Minimum Container Size (Memory)</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -95,6 +102,7 @@
and will get capped to this value.
</description>
<display-name>Maximum Container Size (Memory)</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -114,6 +122,7 @@
<name>yarn.acl.enable</name>
<value>false</value>
<description> Are acls enabled. </description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -123,6 +132,7 @@
<name>yarn.admin.acl</name>
<value></value>
<description> ACL of who can be admin of the YARN cluster. </description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -134,6 +144,7 @@
<name>yarn.nodemanager.address</name>
<value>0.0.0.0:45454</value>
<description>The address of the container manager in the NM.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -142,6 +153,7 @@
<description>Amount of physical memory, in MB, that can be allocated
for containers.</description>
<display-name>Memory allocated for all YARN containers on a node</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -155,6 +167,7 @@
<name>yarn.application.classpath</name>
<value>/etc/hadoop/conf,/usr/iop/current/hadoop-client/*,/usr/iop/current/hadoop-client/lib/*,/usr/iop/current/hadoop-hdfs-client/*,/usr/iop/current/hadoop-hdfs-client/lib/*,/usr/iop/current/hadoop-yarn-client/*,/usr/iop/current/hadoop-yarn-client/lib/*</value>
<description>Classpath for typical applications.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -166,6 +179,7 @@
is allowed to exceed this allocation by this ratio.
</description>
<display-name>Virtual Memory Ratio</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
<minimum>0.1</minimum>
@@ -178,6 +192,7 @@
<name>yarn.nodemanager.container-executor.class</name>
<value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value>
<description>ContainerExecutor for launching containers</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>yarn-env</type>
@@ -190,6 +205,7 @@
<name>yarn.nodemanager.linux-container-executor.group</name>
<value>hadoop</value>
<description>Unix group of the NodeManager</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>yarn-env</type>
@@ -203,12 +219,14 @@
<value>mapreduce_shuffle</value>
<description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can
not start with numbers</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
<value>org.apache.hadoop.mapred.ShuffleHandler</value>
<description>The auxiliary service class to use </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -221,6 +239,7 @@
named container_{$contid}. Each container directory will contain the files
stderr, stdin, and syslog generated by that container.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
</value-attributes>
@@ -236,6 +255,7 @@
Individual containers' work directories, called container_${contid}, will
be subdirectories of this.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directories</type>
</value-attributes>
@@ -248,6 +268,7 @@
The interval, in milliseconds, for which the node manager
waits between two cycles of monitoring its containers' memory usage.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
@@ -255,6 +276,7 @@
<name>yarn.nodemanager.health-checker.script.path</name>
<value>/etc/hadoop/conf/health_check_nodemanager</value>
<description>The health check script to run.</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -262,12 +284,14 @@
<name>yarn.nodemanager.health-checker.interval-ms</name>
<value>135000</value>
<description>Frequency of running node health script.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.health-checker.script.timeout-ms</name>
<value>60000</value>
<description>Script time out period.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -277,6 +301,7 @@
Time in seconds to retain user logs. Only applicable if
log aggregation is disabled.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -284,6 +309,7 @@
<value>true</value>
<description>Whether to enable log aggregation. </description>
<display-name>Enable Log Aggregation</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -293,6 +319,7 @@
<name>yarn.nodemanager.remote-app-log-dir</name>
<value>/app-logs</value>
<description>Location to aggregate logs to. </description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -305,6 +332,7 @@
The remote log dir will be created at
{yarn.nodemanager.remote-app-log-dir}/${user}/{thisParam}.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -313,6 +341,7 @@
<description>
T-file compression types used to compress aggregated logs.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -333,6 +362,7 @@
of the Yarn applications' log directories is configurable with the
yarn.nodemanager.log-dirs property (see also below).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -342,6 +372,7 @@
How long to keep aggregation logs before deleting them. -1 disables.
Be careful set this too small and you will spam the name node.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -351,6 +382,7 @@
Environment variables that should be forwarded from the NodeManager's
environment to the container's.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -363,6 +395,7 @@
If there are less number of healthy local-dirs (or log-dirs) available,
then new containers will not be launched on this node.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -376,6 +409,7 @@
the resourcemanager will override it. The default number is set to 2, to
allow at least one retry for AM.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -384,6 +418,7 @@
<description>
The address of the RM web application.
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -392,6 +427,7 @@
<description>
Whether virtual memory limits will be enforced for containers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -400,6 +436,7 @@
<description>
URI for the HistoryServer's log resource
</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -411,6 +448,7 @@
file must be specified. If the value is empty, no hosts are
excluded.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -419,6 +457,7 @@
<description>Indicate to clients whether timeline service is enabled or not.
If enabled, clients will put entities and events to the timeline server.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -431,6 +470,7 @@
<description>
Store class name for timeline store
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -439,6 +479,7 @@
<description>
Store class name for history store, defaulting to file system store
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -447,6 +488,7 @@
<description>
Store file name for leveldb timeline store
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -458,6 +500,7 @@
<description>
The http address of the timeline service web application.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -466,6 +509,7 @@
<description>
The http address of the timeline service web application.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -475,11 +519,13 @@
This is default address for the timeline server to start
the RPC server.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.timeline-service.ttl-enable</name>
<description>Enable age off of timeline store data.</description>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -488,6 +534,7 @@
<description>Time to live for timeline store data in milliseconds.</description>
<name>yarn.timeline-service.ttl-ms</name>
<value>2678400000</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -496,6 +543,7 @@
<description>Length of time to wait between deletion cycles of leveldb timeline store in milliseconds.</description>
<name>yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms</name>
<value>300000</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
@@ -508,6 +556,7 @@
<name>yarn.nodemanager.recovery.enabled</name>
<value>false</value>
<description>Enable the node manager to recover after starting</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.recovery.enabled</name>
@@ -516,6 +565,7 @@
Enable RM to recover state after starting.
If true, then yarn.resourcemanager.store.class must be specified.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.work-preserving-recovery.enabled</name>
@@ -523,6 +573,7 @@
<description>
Enable RM work preserving recovery. This configuration is private to YARN for experimenting the feature.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.zk-address</name>
@@ -530,21 +581,25 @@
<description>
List Host:Port of the ZooKeeper servers to be used by the RM. comma separated host:port pairs, each corresponding to a zk server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002" If the optional chroot suffix is used the example would look like: "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002/app/a" where the client would be rooted at "/app/a" and all paths would be relative to this root - ie getting/setting/etc... "/foo/bar" would result in operations being run on "/app/a/foo/bar" (from the server perspective).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.connect.retry-interval.ms</name>
<value>30000</value>
<description>How often to try connecting to the ResourceManager.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.connect.max-wait.ms</name>
<value>900000</value>
<description>Maximum time to wait to establish connection to ResourceManager</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.ha.enabled</name>
<value>false</value>
<description>enable RM HA or not</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Isolation -->
@@ -552,21 +607,25 @@
<name>yarn.nodemanager.linux-container-executor.resources-handler.class</name>
<value>org.apache.hadoop.yarn.server.nodemanager.util.DefaultLCEResourcesHandler</value>
<description>Pre-requisite to use CGroups</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.linux-container-executor.cgroups.hierarchy</name>
<value>hadoop-yarn</value>
<description>Name of the Cgroups hierarchy under which all YARN jobs will be launched</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.linux-container-executor.cgroups.mount</name>
<value>false</value>
<description>If true, YARN will automount the CGroup, however the directory needs to already exist; else, the cgroup should be mounted by the admin</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage</name>
<value>false</value>
<description>Strictly limit CPU resource usage to allocated usage even if spare CPU is available</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Scheduler -->
@@ -575,6 +634,7 @@
<value>8</value>
<description></description>
<display-name>Number of virtual cores</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -593,6 +653,7 @@
<value>80</value>
<description>The amount of CPU allocated for YARN containers - only effective when used with CGroups</description>
<display-name>Percentage of physical CPU allocated for all containers on a node</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -608,11 +669,13 @@
Defines authentication used for the Timeline Server HTTP endpoint.
Supported values are: simple | kerberos | $AUTHENTICATION_HANDLER_CLASSNAME
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.timeline-service.http-authentication.simple.anonymous.allowed</name>
<value>true</value>
<description></description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.webapp.delegation-token-auth-filter.enabled</name>
@@ -623,34 +686,41 @@
tokens(fallback to kerberos if the tokens are missing).
Only applicable when the http authentication type is kerberos.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.timeline-service.bind-host</name>
<value>0.0.0.0</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.bind-host</name>
<value>0.0.0.0</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.bind-host</name>
<value>0.0.0.0</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.system-metrics-publisher.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.registry.rm.enabled</name>
<value>false</value>
<description> Is the registry enabled: does the RM start it up, create the user and system paths, and purge service records when
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.registry.zk.quorum</name>
<value>localhost:2181</value>
<description> List of hostname:port pairs defining the zookeeper quorum binding for the registry </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -660,9 +730,7 @@
Enable node labels to restrict YARN applications so that they run only on cluster nodes that have a specified node label.
</description>
<display-name>Node Labels</display-name>
- <value-attributes>
- <type>boolean</type>
- </value-attributes>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -683,6 +751,7 @@
<name>yarn.resourcemanager.scheduler.monitor.enable</name>
<value>false</value>
<display-name>Pre-emption</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -704,6 +773,7 @@
<value>1</value>
<description></description>
<display-name>Minimum Container Size (VCores)</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -723,6 +793,7 @@
<value>8</value>
<description></description>
<display-name>Maximum Container Size (VCores)</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -743,6 +814,7 @@
<description>
This configures the HTTP endpoint for Yarn Daemons.The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : Service is provided only on https
</description>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml
index 275cc6a..18793ae 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml
@@ -26,6 +26,7 @@
<display-name>Length of single Tick</display-name>
<value>2000</value>
<description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -37,6 +38,7 @@
<display-name>Ticks to allow for sync at Init</display-name>
<value>10</value>
<description>Ticks to allow for sync at Init.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -47,6 +49,7 @@
<display-name>Ticks to allow for sync at Runtime</display-name>
<value>5</value>
<description>Ticks to allow for sync at Runtime.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -57,6 +60,7 @@
<display-name>Port for running ZK Server</display-name>
<value>2181</value>
<description>Port for running ZK Server.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<overridable>false</overridable>
@@ -67,6 +71,7 @@
<display-name>ZooKeeper directory</display-name>
<value>/hadoop/zookeeper</value>
<description>Data directory for ZooKeeper.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -75,10 +80,12 @@
<name>autopurge.snapRetainCount</name>
<value>30</value>
<description>ZooKeeper purge feature retains the autopurge.snapRetainCount most recent snapshots and the corresponding transaction logs in the dataDir and dataLogDir respectively and deletes the rest. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>autopurge.purgeInterval</name>
<value>24</value>
<description>The time interval in hours for which the purge task has to be triggered. Set to a positive integer (1 and above) to enable the auto purging.</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/ZOOKEEPER/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml
index b57992e..b5dca83 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml
@@ -24,6 +24,7 @@
<property>
<name>zk_user</name>
<value>zookeeper</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>ZooKeeper User.</description>
</property>
@@ -32,6 +33,7 @@
<display-name>ZooKeeper Log Dir</display-name>
<value>/var/log/zookeeper</value>
<description>ZooKeeper Log Dir</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<editable-only-at-install>true</editable-only-at-install>
@@ -43,6 +45,7 @@
<display-name>ZooKeeper PID Dir</display-name>
<value>/var/run/zookeeper</value>
<description>ZooKeeper Pid Dir</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
<editable-only-at-install>true</editable-only-at-install>
@@ -69,5 +72,6 @@ export SERVER_JVMFLAGS="$SERVER_JVMFLAGS -Djava.security.auth.login.config={{zk_
export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_client_jaas_file}}"
{% 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.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
index 6fcf5bc..3ac037a 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
@@ -96,6 +96,7 @@ log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
### Notice we are including log4j's NDC here (%x)
log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
</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.1/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml
index 3747825..001f498 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml
@@ -25,6 +25,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 -->
@@ -66,5 +67,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.1/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml
index d92e473..612c4f3 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml
@@ -152,12 +152,14 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/iop/current/hadoop-client/lib
#Hadoop logging options. Modify and uncomment to change logging level
#export HADOOP_ROOT_LOGGER={{hadoop_root_logger}}
</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>nfsgateway_heapsize</name>
<display-name>NFSGateway maximum Java heap size</display-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.1/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml
index 1a40673..434cbb8 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml
@@ -32,6 +32,7 @@
they are accumulated to exceed certain threshold (e.g., 1MB) in memory.
One needs to make sure the directory has enough space.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>directory</type>
</value-attributes>
@@ -41,6 +42,7 @@
<name>nfs.exports.allowed.hosts</name>
<value>* rw</value>
<display-name>Allowed hosts</display-name>
+ <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.1/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml
index 2014c78..25d3e1d 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml
@@ -81,12 +81,14 @@ ${HIVE_AUX_JARS_PATH}
export METASTORE_PORT={{hive_metastore_port}}
</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_security_authorization</name>
<display-name>Choose Authorization</display-name>
<value>None</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -106,6 +108,7 @@ export METASTORE_PORT={{hive_metastore_port}}
<name>hive_exec_orc_storage_strategy</name>
<display-name>ORC Storage Strategy</display-name>
<value>SPEED</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -126,6 +129,7 @@ export METASTORE_PORT={{hive_metastore_port}}
<name>hive_txn_acid</name>
<display-name>ACID Transactions</display-name>
<value>off</value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -147,6 +151,7 @@ export METASTORE_PORT={{hive_metastore_port}}
<value>1024</value>
<description>Hive Java heap size</description>
<display-name>HiveServer2 Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -162,6 +167,7 @@ export METASTORE_PORT={{hive_metastore_port}}
<value>512</value>
<description>Hive Client Java heap size</description>
<display-name>Client Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
@@ -177,6 +183,7 @@ export METASTORE_PORT={{hive_metastore_port}}
<value>1024</value>
<description>Hive Metastore Java heap size</description>
<display-name>Metastore Heap Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>512</minimum>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml
index e1a2114..4046051 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml
@@ -23,6 +23,7 @@ limitations under the License.
<name>hive.security.authenticator.manager</name>
<value>org.apache.hadoop.hive.ql.security.ProxyUserAuthenticator</value>
<description>Hive client authenticator manager class name. The user-defined authenticator class should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -30,6 +31,7 @@ limitations under the License.
<value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</value>
<description>the hive client authorization manager class name.
The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -40,6 +42,7 @@ limitations under the License.
Hive operations as the user making the calls to it.
</description>
<display-name>Run as end user instead of Hive user</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -61,12 +64,13 @@ limitations under the License.
<value>256000000</value>
<description>size per reducer.The default is 256Mb, i.e if the input size is 1G, it will use 4 reducers.</description>
<display-name>Data per Reducer</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>64</minimum>
<maximum>4294967296</maximum>
<unit>B</unit>
- <step-increment></step-increment>
+ <increment-step></increment-step>
</value-attributes>
</property>
<property>
@@ -78,6 +82,7 @@ limitations under the License.
org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider.
</description>
<display-name>Hive Authorization Manager</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>string</type>
</value-attributes>
@@ -90,6 +95,7 @@ limitations under the License.
converted to a mapjoin(there is no conditional task). The default is 10MB.
</description>
<display-name>For Map Join, per Map memory threshold</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>1073741824</minimum>
@@ -107,6 +113,7 @@ limitations under the License.
when it is brought up. JDBC/ODBC clients should use the ZooKeeper ensemble: hive.zookeeper.quorum
in their connection string.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -116,6 +123,7 @@ limitations under the License.
<name>hive.vectorized.groupby.checkinterval</name>
<value>100000</value>
<description>Number of entries added to the group by aggregation hash before a recomputation of average entry size is performed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -123,6 +131,7 @@ limitations under the License.
<value>true</value>
<description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description>
<display-name>Enable Cost Based Optimizer</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -143,6 +152,7 @@ limitations under the License.
<value>67108864</value>
<description>Define the default ORC stripe size</description>
<display-name>Default ORC Stripe Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>8388608</minimum>
@@ -156,6 +166,7 @@ limitations under the License.
<value>ZLIB</value>
<description>Define the default compression codec for ORC file</description>
<display-name>ORC Compression Algorithm</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -181,6 +192,7 @@ limitations under the License.
of column statistics from metastore.
</description>
<display-name>Fetch column stats at compiler</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -207,6 +219,7 @@ limitations under the License.
<description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description>
<value>NONE</value>
<display-name>HiveServer2 Authentication</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -239,6 +252,7 @@ limitations under the License.
<value>false</value>
<description/>
<display-name>Use SSL</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -261,6 +275,7 @@ limitations under the License.
Chooses execution engine. Option is: mr (Map reduce, default)
</description>
<display-name>hive.execution.engine</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -277,6 +292,7 @@ limitations under the License.
<value>false</value>
<description>Whether to run the compactor's initiator thread in this metastore instance or not. If there is more than one instance of the thrift metastore this should only be set to true for one of them.</description>
<display-name>Run Compactor</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -303,6 +319,7 @@ limitations under the License.
<value>0</value>
<description>Number of compactor worker threads to run on this metastore instance. Can be different values on different metastore instances.</description>
<display-name>Number of threads used by Compactor</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -321,6 +338,7 @@ limitations under the License.
<value>TextFile</value>
<description>Default file format for CREATE TABLE statement.</description>
<display-name>Default File Format</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml
index ff82a35..a3c3d6b 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml
@@ -60,5 +60,6 @@ limitations under the License.
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>
-</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.1/services/YARN/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml
index bd5a911..606fa9d 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml
@@ -29,6 +29,7 @@
server state upon startup. If enabled then
mapreduce.jobhistory.recovery.store.class must be specified.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -37,6 +38,7 @@
<description>The HistoryServerStateStoreService class to store history server
state for recovery.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -45,6 +47,7 @@
<description>The URI where history server state will be stored if HistoryServerLeveldbSystemStateStoreService
is configured as the recovery storage class.
</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.1/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml
index 12a8a21..236de2a 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml
@@ -24,20 +24,23 @@
<property>
<name>yarn.node-labels.manager-class</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.timeline-service.recovery.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.admin.acl</name>
<value>yarn</value>
<description> ACL of who can be admin of the YARN cluster. </description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</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.5/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml
index 047d3f6..b824ce2 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml
@@ -273,6 +273,7 @@
<property>
<name>hbase.table.sanity.checks</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -379,10 +380,12 @@
<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>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml
index 39a1060..f5a986b 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml
@@ -22,6 +22,7 @@
<property>
<name>dfs.namenode.acls.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.audit.log.async</name>
@@ -139,6 +140,7 @@
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml
index c04c5a1..799a3b3 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml
@@ -34,7 +34,6 @@ limitations under the License.
<description>Database name used as the Hive Metastore</description>
<value-attributes>
<type>database</type>
- <type>host</type>
<overridable>false</overridable>
</value-attributes>
<on-ambari-upgrade add="true"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml
index 49d813e..7bedc63 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml
@@ -30,6 +30,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>
@@ -45,17 +46,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>
@@ -64,18 +68,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/hive/audit/db/spool</value>
<description>/var/log/hive/audit/db/spool</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -83,6 +90,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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml
index e29dca9..307b009 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml
@@ -24,5 +24,6 @@ limitations under the License.
<name>gateway.websocket.feature.enabled</name>
<value>true</value>
<description>Enable/Disable websocket feature.</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.5/services/KNOX/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml
index b0a7baf..e2cc3e0 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml
@@ -25,6 +25,7 @@
<display-name>Knox Logs dir</display-name>
<value>/var/log/knox</value>
<description>Knox Log 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.2.5/services/KNOX/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml
index 9cbbab1..a8d742c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml
@@ -200,6 +200,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.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml
index b6a14a2..f8d50fc 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml
@@ -23,6 +23,7 @@
<name>content</name>
<description>Spark2-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.5/services/YARN/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml
index d5d281f..7b4303e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml
@@ -134,5 +134,6 @@
<description>
User added environment variables for the MR App Master processes.
</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.5/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml
index 39a9e06..9dcb52e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml
@@ -737,6 +737,7 @@
is allowed to exceed this allocation by this ratio.
</description>
<display-name>Virtual Memory Ratio</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
<minimum>0.1</minimum>
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-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml
index 1861ebd..45f9880 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml
@@ -23,6 +23,7 @@
<name>ambari_metrics_user</name>
<display-name>Ambari Metrics User</display-name>
<value>ams</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>Ambari Metrics User Name.</description>
</property>
@@ -31,29 +32,34 @@
<value>/var/log/ambari-metrics-collector</value>
<display-name>Metrics Collector log dir</display-name>
<description>Collector log directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_collector_pid_dir</name>
<value>/var/run/ambari-metrics-collector</value>
<display-name>Metrics Collector pid dir</display-name>
<description>Collector pid directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_monitor_pid_dir</name>
<value>/var/run/ambari-metrics-monitor</value>
<display-name>Metrics Monitor pid dir</display-name>
<description>Monitor pid directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_monitor_log_dir</name>
<value>/var/log/ambari-metrics-monitor</value>
<display-name>Metrics Monitor log dir</display-name>
<description>Monitor log directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_collector_heapsize</name>
<value>512</value>
<description>Metrics Collector Heap Size</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -102,6 +108,7 @@ export AMS_COLLECTOR_GC_OPTS="-XX:+UseConcMarkSweepGC -verbose:gc -XX:+PrintGCDe
export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS"
</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/AMBARI_METRICS/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
index 743822d..00d396c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
@@ -25,16 +25,19 @@
<name>hbase_log_dir</name>
<value>/var/log/ambari-metrics-collector</value>
<description>Log Directories for HBase.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_pid_dir</name>
<value>/var/run/ambari-metrics-collector/</value>
<description>Pid Directory for HBase.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_classpath_additional</name>
<value></value>
<description>Additional directory or jar in classpath for HBase.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -46,6 +49,7 @@
HBase RegionServer Heap Size. In embedded mode, total heap size is
sum of master and regionserver heap sizes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -65,6 +69,7 @@
<name>regionserver_xmn_size</name>
<value>256</value>
<description>HBase RegionServer maximum value for young generation heap size.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -82,6 +87,7 @@
<description>
HBase Master maximum value for young generation heap size.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -97,6 +103,7 @@
<name>hbase_master_maxperm_size</name>
<value>128</value>
<description>HBase RegionServer maximum value for perm heap size.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -106,6 +113,7 @@
<name>hbase_regionserver_xmn_ratio</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"/>
</property>
<property>
<name>hbase_master_heapsize</name>
@@ -114,6 +122,7 @@
HBase Master Heap Size. In embedded mode, total heap size is
sum of master and regionserver heap sizes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -135,6 +144,7 @@
<description>
The maximum number of open file descriptors by process
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- hbase-env.sh -->
@@ -229,6 +239,7 @@ export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
# Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs
export HADOOP_HOME={{ams_hbase_home_dir}}
</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/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
index 44fc7c6..4eea14f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-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/AMBARI_METRICS/configuration/ams-hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
index 55ccab8..13726a2 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-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/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
index 607fbda..64799c1 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
@@ -23,6 +23,7 @@
<property>
<name>ams.zookeeper.keytab</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -30,6 +31,7 @@
<property>
<name>ams.zookeeper.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -37,6 +39,7 @@
<property>
<name>hadoop.security.authentication</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -44,6 +47,7 @@
<property>
<name>hbase.coprocessor.master.classes</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -51,6 +55,7 @@
<property>
<name>hbase.coprocessor.region.classes</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -58,6 +63,7 @@
<property>
<name>hbase.master.kerberos.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -65,6 +71,7 @@
<property>
<name>hbase.master.keytab.file</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -72,6 +79,7 @@
<property>
<name>hbase.myclient.keytab</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -79,6 +87,7 @@
<property>
<name>hbase.myclient.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -86,6 +95,7 @@
<property>
<name>hbase.regionserver.kerberos.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -93,6 +103,7 @@
<property>
<name>hbase.regionserver.keytab.file</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -100,6 +111,7 @@
<property>
<name>hbase.security.authentication</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -107,6 +119,7 @@
<property>
<name>hbase.security.authorization</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -114,6 +127,7 @@
<property>
<name>hbase.zookeeper.property.authProvider.1</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -121,6 +135,7 @@
<property>
<name>hbase.zookeeper.property.jaasLoginRenew</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -128,6 +143,7 @@
<property>
<name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -135,6 +151,7 @@
<property>
<name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -142,6 +159,7 @@
<property>
<name>zookeeper.znode.parent</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
[03/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-broker.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-broker.xml
index 3da042b..de07b6b 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-broker.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-broker.xml
@@ -25,6 +25,7 @@
<name>listeners</name>
<value>PLAINTEXT://localhost:6667</value>
<description>host and port where kafka broker will be accepting connnections. localhost will be subsituted with hostname.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>log.dirs</name>
@@ -33,6 +34,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>
@@ -47,6 +49,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>
@@ -56,6 +59,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>
@@ -64,6 +68,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>
@@ -71,11 +76,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>
@@ -83,6 +90,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>
@@ -90,6 +98,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>
@@ -97,6 +106,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>
@@ -104,6 +114,7 @@
<description>
The default number of partitions per topic.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>log.segment.bytes</name>
@@ -112,6 +123,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>
@@ -119,6 +131,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>
@@ -126,6 +139,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>
@@ -133,12 +147,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>
@@ -148,6 +164,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>
@@ -155,6 +172,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>
<name>auto.create.topics.enable</name>
@@ -162,26 +180,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>
@@ -189,32 +212,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>
@@ -222,46 +251,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>25000</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>true</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>
@@ -269,6 +307,7 @@
<description>
Backoff time between shutdown retries.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kafka.metrics.reporters</name>
@@ -276,6 +315,7 @@
<description>
kafka timeline metrics reporter
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -284,26 +324,31 @@
<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>external.kafka.metrics.exclude.prefix</name>
@@ -311,6 +356,7 @@
<description>
Exclude metrics starting with these prefixes from being collected.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>external.kafka.metrics.include.prefix</name>
@@ -318,41 +364,49 @@
<description>
These metrics would be included even if the exclude prefix omits them.
</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>
@@ -361,51 +415,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.2/services/KAFKA/configuration/kafka-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-env.xml
index 7b12ebb..cc22c91 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-env.xml
@@ -25,6 +25,7 @@
<name>kafka_user</name>
<display-name>Kafka User</display-name>
<value>kafka</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description></description>
</property>
@@ -32,12 +33,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>
@@ -48,11 +51,13 @@
<name>kafka_user_nofile_limit</name>
<value>32000</value>
<description>Max open files limit setting for KAFKA user.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kafka_user_nproc_limit</name>
<value>16000</value>
<description>Max number of processes limit setting for KAFKA user.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- kafka-env.sh -->
@@ -76,5 +81,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.2/services/KAFKA/configuration/kafka-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-log4j.xml
index 51a3b0f..aea7cca 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KAFKA/configuration/kafka-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/KERBEROS/configuration/kerberos-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/configuration/kerberos-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/configuration/kerberos-env.xml
index 8441586..5aa1d29 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/configuration/kerberos-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/configuration/kerberos-env.xml
@@ -23,13 +23,12 @@
<configuration supports_final="false" supports_do_not_extend="true">
<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.2/services/KERBEROS/configuration/krb5-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/configuration/krb5-conf.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/configuration/krb5-conf.xml
index d6a82e8..bc76238 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KERBEROS/configuration/krb5-conf.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/KNOX/configuration/gateway-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-log4j.xml
index eac64f1..b8857a9 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/KNOX/configuration/gateway-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-site.xml
index d23314d..23502f1 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/gateway-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/KNOX/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/knox-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/knox-env.xml
index 6443438..ec15d06 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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>
@@ -66,6 +70,7 @@
<display-name>Knox Logs dir</display-name>
<value>/var/log/knox</value>
<description>Knox Log 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.2/services/KNOX/configuration/ldap-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ldap-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ldap-log4j.xml
index 21e1c4e..9d2a07c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ldap-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/KNOX/configuration/ranger-knox-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-audit.xml
index ec19831..314222f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-audit.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-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/knox/audit/db/spool</value>
<description>/var/log/knox/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/knox/audit/hdfs/spool</value>
<description>/var/log/knox/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/knox/audit/solr/spool</value>
<description>/var/log/knox/audit/solr/spool</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -169,6 +184,7 @@
<value>false</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/KNOX/configuration/ranger-knox-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
index 2474baa..bd39f36 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
@@ -25,6 +25,7 @@
<value>ambari-qa</value>
<display-name>Policy user for KNOX</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -34,6 +35,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -51,6 +53,7 @@
<type>boolean</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -58,6 +61,7 @@
<value>admin</value>
<display-name>Ranger repository config user</display-name>
<description>Used for repository creation on ranger admin</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -66,6 +70,7 @@
<display-name>Ranger repository config password</display-name>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -73,6 +78,7 @@
<value>/usr/iop/current/knox-server</value>
<display-name>Knox Home</display-name>
<description>Knox home folder</description>
+ <on-ambari-upgrade add="false"/>
</property>
<!-- Properties from HDP 2.3 -->
@@ -83,128 +89,153 @@
<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>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/KNOX/configuration/ranger-knox-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
index 4ccf1f3..6db44ce 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
@@ -24,11 +24,13 @@
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/iop/current/knox-server/conf/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.keystore.password</name>
<value>myKeyFilePassword</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
</property>
@@ -37,11 +39,13 @@
<name>xasecure.policymgr.clientssl.truststore</name>
<value>/usr/iop/current/knox-server/conf/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.password</name>
<value>changeit</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
</property>
@@ -50,12 +54,14 @@
<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>
\ 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/KNOX/configuration/ranger-knox-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-security.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-security.xml
index e627d08..486c50f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-security.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/ranger-knox-security.xml
@@ -24,36 +24,42 @@
<name>ranger.plugin.knox.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this Knox instance</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.plugin.knox.policy.source.impl</name>
<value>org.apache.ranger.admin.client.RangerAdminJersey2RESTClient</value>
<description>Class to retrieve policies from the source</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.plugin.knox.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.knox.policy.rest.ssl.config.file</name>
<value>/usr/iop/current/knox-server/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.knox.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.knox.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>
-</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/KNOX/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/topology.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/topology.xml
index b458855..35e715c 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/topology.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/topology.xml
@@ -167,6 +167,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.2/services/KNOX/configuration/users-ldif.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/users-ldif.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/users-ldif.xml
index ce19feb..6d54bd7 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/configuration/users-ldif.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-env.xml
index b335e77..fbf1d2f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/OOZIE/configuration/oozie-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-log4j.xml
index 0f44359..6927923 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-site.xml
index 5196811..e659c03 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/PIG/configuration/pig-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-env.xml
index 47da349..731e4c6 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/PIG/configuration/pig-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-log4j.xml
index 040804c..e80327e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-properties.xml
index bfd2ab5..eb6eb5a 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/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.2/services/RANGER/configuration/admin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/admin-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/admin-properties.xml
index 763b370..18fd43b 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/admin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/configuration/admin-properties.xml
@@ -26,6 +26,7 @@
<value>MYSQL</value>
<display-name>DB FLAVOR</display-name>
<description>The database type to be used (mysql/oracle)</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
@@ -59,6 +60,7 @@
<property>
<name>SQL_COMMAND_INVOKER</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -67,6 +69,7 @@
<display-name>Location of Sql Connector Jar</display-name>
<value>/usr/share/java/mysql-connector-java.jar</value>
<description>Location of DB client library (please check the location of the jar file)</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -77,6 +80,7 @@
<value>root</value>
<display-name>Database Administrator (DBA) username</display-name>
<description>Database admin user. This user should have DBA permission to create the Ranger Database and Ranger Database User</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -88,6 +92,7 @@
<value></value>
<property-type>PASSWORD</property-type>
<description>Database password for the database admin user-id</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -98,6 +103,7 @@
<display-name>Ranger DB host</display-name>
<value></value>
<description>Database host</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -108,6 +114,7 @@
<display-name>Ranger DB name</display-name>
<value>ranger</value>
<description>Database name</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -118,6 +125,7 @@
<display-name>Ranger DB username</display-name>
<value>rangeradmin</value>
<description>Database username used for the Ranger schema</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -129,6 +137,7 @@
<value></value>
<property-type>PASSWORD</property-type>
<description>Database password for the Ranger schema</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -142,6 +151,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -152,6 +162,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true"/>
</property>
<property require-input="true">
@@ -163,6 +174,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -170,6 +182,7 @@
<display-name>External URL</display-name>
<value></value>
<description>Policy Manager external url eg: http://RANGER_HOST:6080</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -197,6 +210,7 @@
<display-name>HTTP enabled</display-name>
<value>true</value>
<description>HTTP Enabled</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -206,56 +220,67 @@
<property>
<name>authentication_method</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>remoteLoginEnabled</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>authServiceHostName</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>authServicePort</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xa_ldap_url</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xa_ldap_userDNpattern</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xa_ldap_groupSearchBase</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xa_ldap_groupSearchFilter</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xa_ldap_groupRoleAttribute</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xa_ldap_ad_domain</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xa_ldap_ad_url</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true"/>
</property>
-->
[10/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
AMBARI-21431. Update BigInsight configuration files to be compliant with XSD
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d6fcfa1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d6fcfa1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d6fcfa1
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: 1d6fcfa199a2eb9530452dc01d2a5af68e0a131b
Parents: 8e1af7a
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Mon Jul 10 08:37:42 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue Jul 11 17:13:50 2017 +0200
----------------------------------------------------------------------
.../ambari/server/stack/StackManager.java | 14 +-
.../4.0/configuration/cluster-env.xml | 21 +++
.../AMBARI_METRICS/configuration/ams-env.xml | 7 +
.../configuration/ams-hbase-env.xml | 11 ++
.../configuration/ams-hbase-log4j.xml | 1 +
.../configuration/ams-hbase-policy.xml | 3 +
.../configuration/ams-hbase-security-site.xml | 18 ++
.../configuration/ams-hbase-site.xml | 47 ++++++
.../AMBARI_METRICS/configuration/ams-log4j.xml | 1 +
.../AMBARI_METRICS/configuration/ams-site.xml | 51 ++++++
.../services/FLUME/configuration/flume-conf.xml | 1 +
.../services/FLUME/configuration/flume-env.xml | 4 +
.../services/HBASE/configuration/hbase-env.xml | 8 +
.../configuration/hbase-javaopts-properties.xml | 1 +
.../HBASE/configuration/hbase-log4j.xml | 1 +
.../HBASE/configuration/hbase-policy.xml | 3 +
.../services/HBASE/configuration/hbase-site.xml | 51 ++++++
.../services/HDFS/configuration/core-site.xml | 14 ++
.../services/HDFS/configuration/hadoop-env.xml | 14 ++
.../HDFS/configuration/hadoop-policy.xml | 11 ++
.../services/HDFS/configuration/hdfs-log4j.xml | 1 +
.../services/HDFS/configuration/hdfs-site.xml | 65 ++++++-
.../services/HDFS/configuration/ssl-client.xml | 7 +
.../services/HDFS/configuration/ssl-server.xml | 8 +
.../services/HIVE/configuration/hcat-env.xml | 1 +
.../services/HIVE/configuration/hive-env.xml | 16 ++
.../HIVE/configuration/hive-exec-log4j.xml | 1 +
.../services/HIVE/configuration/hive-log4j.xml | 1 +
.../services/HIVE/configuration/hive-site.xml | 139 ++++++++++++++-
.../services/HIVE/configuration/webhcat-env.xml | 1 +
.../HIVE/configuration/webhcat-log4j.xml | 1 +
.../HIVE/configuration/webhcat-site.xml | 21 +++
.../KAFKA/configuration/kafka-broker.xml | 66 +++++++-
.../services/KAFKA/configuration/kafka-env.xml | 4 +
.../KAFKA/configuration/kafka-log4j.xml | 1 +
.../KERBEROS/configuration/kerberos-env.xml | 22 ++-
.../KERBEROS/configuration/krb5-conf.xml | 4 +
.../KNOX/configuration/gateway-log4j.xml | 1 +
.../KNOX/configuration/gateway-site.xml | 7 +
.../services/KNOX/configuration/knox-env.xml | 4 +
.../services/KNOX/configuration/ldap-log4j.xml | 1 +
.../services/KNOX/configuration/topology.xml | 1 +
.../services/KNOX/configuration/users-ldif.xml | 1 +
.../services/OOZIE/configuration/oozie-env.xml | 12 ++
.../OOZIE/configuration/oozie-log4j.xml | 1 +
.../services/OOZIE/configuration/oozie-site.xml | 34 ++++
.../4.0/services/PIG/configuration/pig-env.xml | 1 +
.../services/PIG/configuration/pig-log4j.xml | 1 +
.../PIG/configuration/pig-properties.xml | 1 +
.../SLIDER/configuration/slider-client.xml | 1 +
.../SLIDER/configuration/slider-env.xml | 3 +-
.../SLIDER/configuration/slider-log4j.xml | 1 +
.../services/SOLR/configuration/solr-env.xml | 8 +
.../services/SOLR/configuration/solr-log4j.xml | 1 +
.../services/SOLR/configuration/solr-site.xml | 3 +
.../SPARK/configuration/spark-defaults.xml | 16 ++
.../services/SPARK/configuration/spark-env.xml | 6 +
.../configuration/spark-javaopts-properties.xml | 1 +
.../SPARK/configuration/spark-log4j.xml | 1 +
.../configuration/spark-metrics-properties.xml | 1 +
.../services/SQOOP/configuration/sqoop-env.xml | 3 +
.../YARN/configuration-mapred/mapred-env.xml | 5 +
.../YARN/configuration-mapred/mapred-site.xml | 40 +++++
.../YARN/configuration/capacity-scheduler.xml | 15 ++
.../services/YARN/configuration/yarn-env.xml | 10 ++
.../services/YARN/configuration/yarn-log4j.xml | 1 +
.../services/YARN/configuration/yarn-site.xml | 78 ++++++++-
.../ZOOKEEPER/configuration/zoo.cfg.xml | 7 +
.../ZOOKEEPER/configuration/zookeeper-env.xml | 4 +
.../ZOOKEEPER/configuration/zookeeper-log4j.xml | 1 +
.../services/FLUME/configuration/flume-env.xml | 2 +
.../services/HDFS/configuration/hadoop-env.xml | 2 +
.../services/HDFS/configuration/hdfs-site.xml | 4 +-
.../services/HIVE/configuration/hive-env.xml | 7 +
.../services/HIVE/configuration/hive-site.xml | 20 ++-
.../services/OOZIE/configuration/oozie-site.xml | 3 +-
.../YARN/configuration-mapred/mapred-site.xml | 3 +
.../services/YARN/configuration/yarn-site.xml | 5 +-
.../services/HBASE/configuration/hbase-site.xml | 3 +
.../services/HDFS/configuration/hdfs-site.xml | 2 +
.../services/HIVE/configuration/hive-site.xml | 1 -
.../HIVE/configuration/ranger-hive-audit.xml | 8 +
.../KNOX/configuration/gateway-site.xml | 1 +
.../services/KNOX/configuration/knox-env.xml | 1 +
.../services/KNOX/configuration/topology.xml | 1 +
.../spark2-javaopts-properties.xml | 1 +
.../YARN/configuration-mapred/mapred-site.xml | 1 +
.../services/YARN/configuration/yarn-site.xml | 1 +
.../AMBARI_METRICS/configuration/ams-env.xml | 7 +
.../configuration/ams-hbase-env.xml | 11 ++
.../configuration/ams-hbase-log4j.xml | 1 +
.../configuration/ams-hbase-policy.xml | 3 +
.../configuration/ams-hbase-security-site.xml | 18 ++
.../configuration/ams-hbase-site.xml | 47 ++++++
.../AMBARI_METRICS/configuration/ams-log4j.xml | 1 +
.../AMBARI_METRICS/configuration/ams-site.xml | 51 ++++++
.../services/FLUME/configuration/flume-conf.xml | 1 +
.../services/FLUME/configuration/flume-env.xml | 5 +
.../services/HBASE/configuration/hbase-env.xml | 9 +
.../configuration/hbase-javaopts-properties.xml | 1 +
.../HBASE/configuration/hbase-log4j.xml | 1 +
.../HBASE/configuration/hbase-policy.xml | 3 +
.../services/HBASE/configuration/hbase-site.xml | 57 +++++++
.../HBASE/configuration/ranger-hbase-audit.xml | 16 ++
.../ranger-hbase-plugin-properties.xml | 33 +++-
.../ranger-hbase-policymgr-ssl.xml | 6 +
.../configuration/ranger-hbase-security.xml | 9 +-
.../services/HDFS/configuration/core-site.xml | 17 ++
.../services/HDFS/configuration/hadoop-env.xml | 21 +++
.../HDFS/configuration/hadoop-policy.xml | 11 ++
.../services/HDFS/configuration/hdfs-log4j.xml | 1 +
.../services/HDFS/configuration/hdfs-site.xml | 71 +++++++-
.../HDFS/configuration/ranger-hdfs-audit.xml | 16 ++
.../ranger-hdfs-plugin-properties.xml | 31 ++++
.../configuration/ranger-hdfs-policymgr-ssl.xml | 6 +
.../HDFS/configuration/ranger-hdfs-security.xml | 9 +-
.../services/HDFS/configuration/ssl-client.xml | 7 +
.../services/HDFS/configuration/ssl-server.xml | 8 +
.../services/HIVE/configuration/hcat-env.xml | 1 +
.../services/HIVE/configuration/hive-env.xml | 20 +++
.../HIVE/configuration/hive-exec-log4j.xml | 1 +
.../services/HIVE/configuration/hive-log4j.xml | 1 +
.../services/HIVE/configuration/hive-site.xml | 168 ++++++++++++++++++-
.../HIVE/configuration/hiveserver2-site.xml | 3 +
.../HIVE/configuration/ranger-hive-audit.xml | 16 ++
.../ranger-hive-plugin-properties.xml | 33 +++-
.../configuration/ranger-hive-policymgr-ssl.xml | 8 +-
.../HIVE/configuration/ranger-hive-security.xml | 7 +
.../services/HIVE/configuration/webhcat-env.xml | 1 +
.../HIVE/configuration/webhcat-log4j.xml | 1 +
.../HIVE/configuration/webhcat-site.xml | 21 +++
.../KAFKA/configuration/kafka-broker.xml | 66 +++++++-
.../services/KAFKA/configuration/kafka-env.xml | 6 +
.../KAFKA/configuration/kafka-log4j.xml | 1 +
.../KERBEROS/configuration/kerberos-env.xml | 22 ++-
.../KERBEROS/configuration/krb5-conf.xml | 4 +
.../KNOX/configuration/gateway-log4j.xml | 1 +
.../KNOX/configuration/gateway-site.xml | 7 +
.../services/KNOX/configuration/knox-env.xml | 5 +
.../services/KNOX/configuration/ldap-log4j.xml | 1 +
.../KNOX/configuration/ranger-knox-audit.xml | 16 ++
.../ranger-knox-plugin-properties.xml | 33 +++-
.../configuration/ranger-knox-policymgr-ssl.xml | 8 +-
.../KNOX/configuration/ranger-knox-security.xml | 8 +-
.../services/KNOX/configuration/topology.xml | 1 +
.../services/KNOX/configuration/users-ldif.xml | 1 +
.../services/OOZIE/configuration/oozie-env.xml | 12 ++
.../OOZIE/configuration/oozie-log4j.xml | 1 +
.../services/OOZIE/configuration/oozie-site.xml | 34 ++++
.../4.2/services/PIG/configuration/pig-env.xml | 1 +
.../services/PIG/configuration/pig-log4j.xml | 1 +
.../PIG/configuration/pig-properties.xml | 1 +
.../RANGER/configuration/admin-properties.xml | 25 +++
.../RANGER/configuration/ranger-admin-site.xml | 56 ++++++-
.../RANGER/configuration/ranger-env.xml | 27 +++
.../RANGER/configuration/ranger-site.xml | 9 +-
.../RANGER/configuration/ranger-ugsync-site.xml | 46 +++++
.../configuration/usersync-properties.xml | 19 ++-
.../RANGER_KMS/configuration/dbks-site.xml | 11 ++
.../RANGER_KMS/configuration/kms-env.xml | 4 +
.../RANGER_KMS/configuration/kms-log4j.xml | 3 +-
.../RANGER_KMS/configuration/kms-properties.xml | 11 ++
.../RANGER_KMS/configuration/kms-site.xml | 17 ++
.../configuration/ranger-kms-audit.xml | 16 ++
.../configuration/ranger-kms-policymgr-ssl.xml | 6 +
.../configuration/ranger-kms-security.xml | 6 +
.../configuration/ranger-kms-site.xml | 7 +
.../SLIDER/configuration/slider-client.xml | 1 +
.../SLIDER/configuration/slider-env.xml | 3 +-
.../SLIDER/configuration/slider-log4j.xml | 1 +
.../services/SOLR/configuration/solr-env.xml | 10 ++
.../services/SOLR/configuration/solr-log4j.xml | 1 +
.../services/SOLR/configuration/solr-site.xml | 3 +
.../SPARK/configuration/spark-defaults.xml | 16 ++
.../services/SPARK/configuration/spark-env.xml | 6 +
.../configuration/spark-javaopts-properties.xml | 1 +
.../SPARK/configuration/spark-log4j.xml | 1 +
.../configuration/spark-metrics-properties.xml | 1 +
.../services/SQOOP/configuration/sqoop-env.xml | 3 +
.../services/TITAN/configuration/titan-env.xml | 2 +
.../TITAN/configuration/titan-hbase-solr.xml | 1 +
.../TITAN/configuration/titan-log4j.xml | 1 +
.../YARN/configuration-mapred/mapred-env.xml | 7 +
.../YARN/configuration-mapred/mapred-site.xml | 49 ++++++
.../YARN/configuration/capacity-scheduler.xml | 15 ++
.../YARN/configuration/ranger-yarn-audit.xml | 16 ++
.../ranger-yarn-plugin-properties.xml | 6 +
.../configuration/ranger-yarn-policymgr-ssl.xml | 6 +
.../YARN/configuration/ranger-yarn-security.xml | 6 +
.../services/YARN/configuration/yarn-env.xml | 12 ++
.../services/YARN/configuration/yarn-log4j.xml | 1 +
.../services/YARN/configuration/yarn-site.xml | 112 ++++++++++++-
.../ZOOKEEPER/configuration/zoo.cfg.xml | 7 +
.../ZOOKEEPER/configuration/zookeeper-env.xml | 4 +
.../ZOOKEEPER/configuration/zookeeper-log4j.xml | 1 +
195 files changed, 2480 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
index d9a3ac4..b8de740 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.stack;
import java.io.File;
+import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -52,6 +53,7 @@ import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
@@ -447,12 +449,22 @@ public class StackManager {
public static void validateAllPropertyXmlsInFolderRecursively(File stackRoot, Validator validator) throws AmbariException {
Collection<File> files = FileUtils.listFiles(stackRoot, new String[]{"xml"}, true);
for (File file : files) {
+ String path;
+ try {
+ path = file.getCanonicalPath();
+ } catch (IOException ioe) {
+ path = file.getAbsolutePath();
+ }
try {
if (file.getParentFile().getName().contains("configuration")) {
validator.validate(new StreamSource(file));
}
+ } catch (SAXParseException e) {
+ String msg = String.format("File %s:%d didn't pass the validation. Error message: %s", path, e.getLineNumber(), e.getMessage());
+ LOG.error(msg);
+ throw new AmbariException(msg);
} catch (Exception e) {
- String msg = String.format("File %s didn't pass the validation. Error message is : %s", file.getAbsolutePath(), e.getMessage());
+ String msg = String.format("File %s didn't pass the validation. Error message: %s", path, e.getMessage());
LOG.error(msg);
throw new AmbariException(msg);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
index 2d11ef3..c73b6e4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
@@ -61,17 +61,20 @@
<name>security_enabled</name>
<value>false</value>
<description>Hadoop Security</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kerberos_domain</name>
<value>EXAMPLE.COM</value>
<description>Kerberos realm.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ignore_groupsusers_create</name>
<display-name>Skip group modifications during install</display-name>
<value>false</value>
<description>Whether to ignore failures on users and group creation</description>
+ <on-ambari-upgrade add="true"/>
<property-type>ADDITIONAL_USER_PROPERTY</property-type>
<value-attributes>
<overridable>false</overridable>
@@ -82,6 +85,7 @@
<name>smokeuser</name>
<display-name>Smoke User</display-name>
<value>ambari-qa</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>User executing service checks</description>
</property>
@@ -89,11 +93,13 @@
<name>smokeuser_keytab</name>
<value>/etc/security/keytabs/smokeuser.headless.keytab</value>
<description>Path to smoke test user keytab file</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>user_group</name>
<display-name>Hadoop Group</display-name>
<value>hadoop</value>
+ <on-ambari-upgrade add="true"/>
<property-type>GROUP</property-type>
<description>Hadoop user group.</description>
</property>
@@ -113,11 +119,13 @@
<name>tez_tar_source</name>
<value>/usr/iop/current/tez-client/lib/tez.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>tez_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/tez/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property> -->
<!-- Hive tarball is needed by WebHCat. -->
@@ -125,11 +133,13 @@
<name>hive_tar_source</name>
<value>/usr/iop/current/hive-client/hive.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/hive/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Pig tarball is needed by WebHCat. -->
@@ -137,11 +147,13 @@
<name>pig_tar_source</name>
<value>/usr/iop/current/pig-client/pig.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>pig_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/pig/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Hadoop Streaming jar is needed by WebHCat. -->
@@ -149,11 +161,13 @@
<name>hadoop-streaming_tar_source</name>
<value>/usr/iop/current/hadoop-mapreduce-client/hadoop-streaming.jar</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop-streaming_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/mapreduce/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Sqoop tarball is needed by WebHCat. -->
@@ -161,11 +175,13 @@
<name>sqoop_tar_source</name>
<value>/usr/iop/current/sqoop-client/sqoop.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>sqoop_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/sqoop/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- MapReduce2 tarball -->
@@ -173,11 +189,13 @@
<name>mapreduce_tar_source</name>
<value>/usr/iop/current/hadoop-client/mapreduce.tar.gz</value>
<description>Source file path that uses dynamic variables and regex to copy the file to HDFS.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce_tar_destination_folder</name>
<value>hdfs:///iop/apps/{{ stack_version }}/mapreduce/</value>
<description>Destination HDFS folder for the file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -190,17 +208,20 @@ path=/
enabled=1
gpgcheck=0</value>
<description>Template of repositories for rhel and suse.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>repo_ubuntu_template</name>
<value>{{package_type}} {{base_url}} {{components}}</value>
<description>Template of repositories for ubuntu.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>override_uid</name>
<display-name>Have Ambari manage UIDs</display-name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
<property-type>ADDITIONAL_USER_PROPERTY</property-type>
<description>Have Ambari manage UIDs</description>
<value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
index 5910253..158c68f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
@@ -23,6 +23,7 @@
<name>ambari_metrics_user</name>
<display-name>Ambari Metrics User</display-name>
<value>ams</value>
+ <on-ambari-upgrade add="true"/>
<property-type>USER</property-type>
<description>Ambari Metrics User Name.</description>
</property>
@@ -31,29 +32,34 @@
<value>/var/log/ambari-metrics-collector</value>
<display-name>Metrics Collector log dir</display-name>
<description>Collector log directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_collector_pid_dir</name>
<value>/var/run/ambari-metrics-collector</value>
<display-name>Metrics Collector pid dir</display-name>
<description>Collector pid directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_monitor_pid_dir</name>
<value>/var/run/ambari-metrics-monitor</value>
<display-name>Metrics Monitor pid dir</display-name>
<description>Monitor pid directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_monitor_log_dir</name>
<value>/var/log/ambari-metrics-monitor</value>
<display-name>Metrics Monitor log dir</display-name>
<description>Monitor log directory.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>metrics_collector_heapsize</name>
<value>512</value>
<description>Metrics Collector Heap Size</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -102,6 +108,7 @@ export AMS_COLLECTOR_GC_OPTS="-XX:+UseConcMarkSweepGC -verbose:gc -XX:+PrintGCDe
export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS"
</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/AMBARI_METRICS/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
index 379297f..b639a35 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
@@ -25,16 +25,19 @@
<name>hbase_log_dir</name>
<value>/var/log/ambari-metrics-collector</value>
<description>Log Directories for HBase.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_pid_dir</name>
<value>/var/run/ambari-metrics-collector/</value>
<description>Pid Directory for HBase.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_classpath_additional</name>
<value></value>
<description>Additional directory or jar in classpath for HBase.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -46,6 +49,7 @@
HBase RegionServer Heap Size. In embedded mode, total heap size is
sum of master and regionserver heap sizes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -65,6 +69,7 @@
<name>regionserver_xmn_size</name>
<value>256</value>
<description>HBase RegionServer maximum value for young generation heap size.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -82,6 +87,7 @@
<description>
HBase Master maximum value for young generation heap size.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -97,6 +103,7 @@
<name>hbase_master_maxperm_size</name>
<value>128</value>
<description>HBase RegionServer maximum value for perm heap size.</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -106,6 +113,7 @@
<name>hbase_regionserver_xmn_ratio</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"/>
</property>
<property>
<name>hbase_master_heapsize</name>
@@ -114,6 +122,7 @@
HBase Master Heap Size. In embedded mode, total heap size is
sum of master and regionserver heap sizes.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<unit>MB</unit>
@@ -135,6 +144,7 @@
<description>
The maximum number of open file descriptors by process
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- hbase-env.sh -->
@@ -229,6 +239,7 @@ export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
# Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs
export HADOOP_HOME={{ams_hbase_home_dir}}
</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/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
index 52ead29..1a77fab 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-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.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
index febbd44..ba63daa 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-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.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
index 5e7bc518..b0bef31 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml
@@ -23,6 +23,7 @@
<property>
<name>ams.zookeeper.keytab</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -30,6 +31,7 @@
<property>
<name>ams.zookeeper.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -37,6 +39,7 @@
<property>
<name>hadoop.security.authentication</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -44,6 +47,7 @@
<property>
<name>hbase.coprocessor.master.classes</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -51,6 +55,7 @@
<property>
<name>hbase.coprocessor.region.classes</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -58,6 +63,7 @@
<property>
<name>hbase.master.kerberos.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -65,6 +71,7 @@
<property>
<name>hbase.master.keytab.file</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -72,6 +79,7 @@
<property>
<name>hbase.myclient.keytab</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -79,6 +87,7 @@
<property>
<name>hbase.myclient.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -86,6 +95,7 @@
<property>
<name>hbase.regionserver.kerberos.principal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -93,6 +103,7 @@
<property>
<name>hbase.regionserver.keytab.file</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -100,6 +111,7 @@
<property>
<name>hbase.security.authentication</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -107,6 +119,7 @@
<property>
<name>hbase.security.authorization</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -114,6 +127,7 @@
<property>
<name>hbase.zookeeper.property.authProvider.1</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -121,6 +135,7 @@
<property>
<name>hbase.zookeeper.property.jaasLoginRenew</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -128,6 +143,7 @@
<property>
<name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -135,6 +151,7 @@
<property>
<name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name>
<value></value>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -142,6 +159,7 @@
<property>
<name>zookeeper.znode.parent</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.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
index 00d0a2c..45e0fac 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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.0/services/AMBARI_METRICS/configuration/ams-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-log4j.xml
index 2b0a4cf..aa379d9 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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.0/services/AMBARI_METRICS/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-site.xml
index cc9c27a..789ed02 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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.0/services/FLUME/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-conf.xml
index 582e181..892efa4 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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.0/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml
index a448a66..3b14a58 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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>
@@ -86,5 +89,6 @@ export JAVA_HOME={{java_home}}
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.0/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-env.xml
index 47a2bb6..d9700ee 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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>2048</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>2048</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>
@@ -170,6 +177,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.0/services/HBASE/configuration/hbase-javaopts-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml
index 3eca77a..a580077 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-javaopts-properties.xml
@@ -23,5 +23,6 @@
<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.0/services/HBASE/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-log4j.xml
index 2e8fb3d..b516c6f 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml
index b0807b6..5d95449 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-policy.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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.0/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-site.xml
index d4cca6c..40d6a79 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/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>60000</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>60010</value>
<description>The port for the HBase Master web UI.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.port</name>
<value>60020</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>60030</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>
@@ -156,6 +169,7 @@
the minimum possible flushing to occur when updates are blocked due to
memstore limiting.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>float</type>
</value-attributes>
@@ -172,6 +186,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>
@@ -195,6 +210,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>
@@ -212,6 +228,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>
@@ -224,6 +241,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>
@@ -243,6 +261,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>
@@ -265,6 +284,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>
@@ -284,6 +304,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>
@@ -303,6 +324,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>
@@ -324,6 +346,7 @@
<description>
The number of times the region flush operation will be retried.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -336,6 +359,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>
@@ -345,6 +369,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>
@@ -362,6 +387,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>
@@ -372,6 +398,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>
@@ -379,6 +406,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>
@@ -390,23 +418,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/_HOST@EXAMPLE.COM</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/_HOST@EXAMPLE.COM</value>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Additional configuration specific to HBase security -->
@@ -417,6 +450,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>
@@ -426,6 +460,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>
@@ -447,6 +482,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>
@@ -472,6 +508,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>
@@ -497,6 +534,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>
@@ -514,6 +552,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
@@ -530,6 +569,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>
@@ -546,6 +586,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>
@@ -555,6 +596,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>
@@ -567,6 +609,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>
@@ -584,6 +627,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>
@@ -603,6 +647,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>
@@ -643,6 +688,7 @@
(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>
@@ -655,27 +701,32 @@
<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>
</configuration>
[04/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml
index 4c9b63e..9bd478e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml
@@ -24,9 +24,9 @@ limitations under the License.
<value>hive</value>
<display-name>Database Name</display-name>
<description>Database name used as the Hive Metastore</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>database</type>
- <type>host</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -39,6 +39,7 @@ limitations under the License.
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -46,6 +47,7 @@ limitations under the License.
<value>com.mysql.jdbc.Driver</value>
<display-name>JDBC Driver Class</display-name>
<description>Driver class name for a JDBC metastore</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -56,6 +58,7 @@ limitations under the License.
<value>hive</value>
<display-name>Database Username</display-name>
<description>username to use against metastore database</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>db_user</type>
<overridable>false</overridable>
@@ -68,6 +71,7 @@ limitations under the License.
<property-type>PASSWORD</property-type>
<display-name>Database Password</display-name>
<description>password to use against metastore database</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -77,6 +81,7 @@ limitations under the License.
<name>hive.metastore.warehouse.dir</name>
<value>/apps/hive/warehouse</value>
<description>location of default database for the warehouse</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -84,30 +89,35 @@ limitations under the License.
<value>false</value>
<description>If true, the metastore thrift interface will be secured with SASL.
Clients must authenticate with Kerberos.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.cache.pinobjtypes</name>
<value>Table,Database,Type,FieldSchema,Order</value>
<description>List of comma separated metastore object types that should be pinned in the cache</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.uris</name>
<value>thrift://localhost:9083</value>
<description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
<name>hive.metastore.pre.event.listeners</name>
<value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener</value>
<description>List of comma separated listeners for metastore events.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>datanucleus.autoCreateSchema</name>
<value>false</value>
<description>Creates necessary schema on a startup if one doesn't exist</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -117,12 +127,14 @@ limitations under the License.
Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
MetaStore Client socket timeout in seconds
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.execute.setugi</name>
<value>true</value>
<description>In unsecure mode, setting this property to true will cause the metastore to execute DFS operations using the client's reported user and group permissions. Note that this property must be set on both the client and server sides. Further note that its best effort. If client sets its to true and server sets it to false, client setting will be ignored.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -130,6 +142,7 @@ limitations under the License.
<value>false</value>
<description>enable or disable the Hive client authorization</description>
<display-name>Enable Authorization</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -159,6 +172,7 @@ limitations under the License.
The Hive client authorization manager class name. The user defined authorization class should implement
interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -176,6 +190,7 @@ limitations under the License.
The user defined authorization class should implement interface
org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -191,6 +206,7 @@ limitations under the License.
hive client authenticator manager class name. The user defined authenticator should implement
interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -207,6 +223,7 @@ limitations under the License.
Hive operations as the user making the calls to it.
</description>
<display-name>Run as end user instead of Hive user</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -238,6 +255,7 @@ limitations under the License.
<value-attributes>
<type>int</type>
</value-attributes>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -245,6 +263,7 @@ limitations under the License.
<value>true</value>
<deleted>true</deleted>
<description>Enable user impersonation for HiveServer2</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -252,6 +271,7 @@ limitations under the License.
<description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description>
<value>NONE</value>
<display-name>HiveServer2 Authentication</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -284,36 +304,42 @@ limitations under the License.
<name>fs.hdfs.impl.disable.cache</name>
<value>true</value>
<description>Disable HDFS filesystem cache.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.file.impl.disable.cache</name>
<value>true</value>
<description>Disable local filesystem cache.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.enforce.bucketing</name>
<value>true</value>
<description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.enforce.sorting</name>
<value>true</value>
<description>Whether sorting is enforced. If true, while inserting into the table, sorting is enforced.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.map.aggr</name>
<value>true</value>
<description>Whether to use map-side aggregation in Hive Group By queries.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.bucketmapjoin</name>
<value>true</value>
<description>Whether to try bucket mapjoin</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -322,24 +348,28 @@ limitations under the License.
<description> If the tables being joined are sorted and bucketized on the join columns, and they have the same number
of buckets, a sort-merge join can be performed by setting this parameter as true.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.mapred.reduce.tasks.speculative.execution</name>
<value>false</value>
<description>Whether speculative execution for reducers should be turned on. </description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.join</name>
<value>true</value>
<description>Whether Hive enables the optimization about converting common join into mapjoin based on the input file size</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.sortmerge.join</name>
<value>true</value>
<description>Will the join be automatically converted to a sort-merge join, if the joined tables pass the criteria for sort-merge join.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -347,6 +377,7 @@ limitations under the License.
<value>true</value>
<deleted>true</deleted>
<description>Required to Enable the conversion of an SMB (Sort-Merge-Bucket) to a map-join SMB.</description>
+ <on-ambari-upgrade add="false"/>
</property>
<property>
@@ -362,6 +393,7 @@ limitations under the License.
with few files (10 files), the sort-merge join will only use 10 mappers, and a simple map-only join might be faster
if the complete small table can fit in memory, and a map-join can be performed.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -372,6 +404,7 @@ limitations under the License.
If this parameter is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than the
specified size, the join is directly converted to a mapjoin (there is no conditional task).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -382,6 +415,7 @@ limitations under the License.
converted to a mapjoin(there is no conditional task).
</description>
<display-name>For Map Join, per Map memory threshold</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>8192</minimum>
@@ -400,12 +434,14 @@ limitations under the License.
job (for e.g a group by), each map-only job is merged with the following
map-reduce job.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.mapjoin.bucket.cache.size</name>
<value>10000</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- performance -->
@@ -418,6 +454,7 @@ limitations under the License.
The default value is false.
</description>
<display-name>Enable Vectorization and Map Vectorization</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -441,6 +478,7 @@ limitations under the License.
Remove extra map-reduce jobs if the data is already clustered by the same key which needs to be used again.
This should always be set to true. Since it is a new feature, it has been made configurable.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -451,6 +489,7 @@ limitations under the License.
That means if reducer-num of the child RS is fixed (order by or forced bucketing) and small, it can make very slow, single MR.
The optimization will be automatically disabled if number of reducers would be less than specified value.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -458,6 +497,7 @@ limitations under the License.
<value>true</value>
<description>Whether to enable automatic use of indexes</description>
<display-name>Push Filters to Storage</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -481,6 +521,7 @@ limitations under the License.
<description>
TCP port number to listen on, default 10000.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<overridable>false</overridable>
<type>int</type>
@@ -495,6 +536,7 @@ limitations under the License.
when it is brought up. JDBC/ODBC clients should use the ZooKeeper ensemble: hive.zookeeper.quorum
in their connection string.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -504,6 +546,7 @@ limitations under the License.
<name>hive.server2.zookeeper.namespace</name>
<value>hiveserver2</value>
<description>The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -513,6 +556,7 @@ limitations under the License.
Expects one of [binary, http].
Transport mode of HiveServer2.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -520,6 +564,7 @@ limitations under the License.
<value>TextFile</value>
<description>Default file format for CREATE TABLE statement.</description>
<display-name>Default File Format</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -540,6 +585,7 @@ limitations under the License.
<value>true</value>
<description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description>
<display-name>Enable Cost Based Optimizer</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -569,6 +615,7 @@ limitations under the License.
Whether Hive should use memory-optimized hash table for MapJoin. Only works on Tez,
because memory-optimized hashtable cannot be serialized.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -580,6 +627,7 @@ limitations under the License.
org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager,
2. When HiveServer2 supports service discovery via Zookeeper.
</description>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>multiLine</type>
<empty-value-valid>true</empty-value-valid>
@@ -590,12 +638,14 @@ limitations under the License.
<name>hive.metastore.connect.retries</name>
<value>24</value>
<description>Number of retries while opening a connection to metastore</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.failure.retries</name>
<value>24</value>
<description>Number of retries upon failure of Thrift metastore calls</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -605,6 +655,7 @@ limitations under the License.
Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
Number of seconds for the client to wait between consecutive connection attempts
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -612,24 +663,28 @@ limitations under the License.
<value>org.apache.hadoop.hive.thrift.ZooKeeperTokenStore</value>
<description>The delegation token store implementation.
Set to org.apache.hadoop.hive.thrift.ZooKeeperTokenStore for load-balanced cluster.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.cluster.delegation.token.store.zookeeper.connectString</name>
<value>localhost:2181</value>
<description>The ZooKeeper token store connect string.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.scratchdir</name>
<value>/tmp/hive</value>
<description>HDFS root scratch dir for Hive jobs which gets created with write all (733) permission. For each connecting user, an HDFS scratch dir: ${hive.exec.scratchdir}/<username> is created, with ${hive.scratch.dir.permission}.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.submitviachild</name>
<value>false</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -640,6 +695,7 @@ limitations under the License.
separate JVM (true recommended) or not.
Avoids the overhead of spawning new JVM, but can lead to out-of-memory issues.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -649,6 +705,7 @@ limitations under the License.
This controls whether the final outputs of a query (to a local/HDFS file or a Hive table) is compressed.
The compression codec and other options are determined from Hadoop config variables mapred.output.compress*
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -658,6 +715,7 @@ limitations under the License.
This controls whether intermediate files produced by Hive between multiple map-reduce jobs are compressed.
The compression codec and other options are determined from Hadoop config variables mapred.output.compress*
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -665,12 +723,13 @@ limitations under the License.
<value>67108864</value>
<description>Defines the size per reducer. For example, if it is set to 64M, given 256M input size, 4 reducers will be used.</description>
<display-name>Data per Reducer</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>64</minimum>
<maximum>4294967296</maximum>
<unit>B</unit>
- <step-increment></step-increment>
+ <increment-step></increment-step>
</value-attributes>
</property>
@@ -681,6 +740,7 @@ limitations under the License.
max number of reducers will be used. If the one specified in the configuration parameter mapred.reduce.tasks is
negative, Hive will use this one as the max number of reducers when automatically determine number of reducers.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -691,6 +751,7 @@ limitations under the License.
A pre-execution hook is specified as the name of a Java class which implements the
org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -707,6 +768,7 @@ limitations under the License.
A post-execution hook is specified as the name of a Java class which implements the
org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -723,6 +785,7 @@ limitations under the License.
An on-failure hook is specified as the name of Java class which implements the
org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -735,18 +798,21 @@ limitations under the License.
<name>hive.exec.parallel</name>
<value>false</value>
<description>Whether to execute jobs in parallel</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.parallel.thread.number</name>
<value>8</value>
<description>How many jobs at most can be executed in parallel</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.dynamic.partition</name>
<value>true</value>
<description>Whether or not to allow dynamic partitions in DML/DDL.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -758,6 +824,7 @@ limitations under the License.
NonStrict allows all partitions of a table to be dynamic.
</description>
<display-name>Allow all partitions to be Dynamic</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -784,30 +851,35 @@ limitations under the License.
<name>hive.exec.max.dynamic.partitions</name>
<value>5000</value>
<description>Maximum number of dynamic partitions allowed to be created in total.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.max.dynamic.partitions.pernode</name>
<value>2000</value>
<description>Maximum number of dynamic partitions allowed to be created in each mapper/reducer node.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.exec.max.created.files</name>
<value>100000</value>
<description>Maximum number of HDFS files created by all mappers/reducers in a MapReduce job.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.server.max.threads</name>
<value>100000</value>
<description>Maximum number of worker threads in the Thrift server's pool.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.kerberos.keytab.file</name>
<value>/etc/security/keytabs/hive.service.keytab</value>
<description>The path to the Kerberos Keytab file containing the metastore Thrift server's service principal.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -817,12 +889,14 @@ limitations under the License.
The service principal for the metastore Thrift server.
The special string _HOST will be replaced automatically with the correct host name.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.cluster.delegation.token.store.zookeeper.znode</name>
<value>/hive/cluster/delegation</value>
<description>The root path for token store data.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -834,18 +908,21 @@ limitations under the License.
question doesn't have permissions to delete the corresponding directory
on the storage).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.smbjoin.cache.rows</name>
<value>10000</value>
<description>How many rows with the same key value should be cached in memory per smb joined table.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.map.aggr.hash.percentmemory</name>
<value>0.5</value>
<description>Portion of total memory to be used by map-side group aggregation hash table</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -855,6 +932,7 @@ limitations under the License.
The max memory to be used by map-side group aggregation hash table.
If the memory usage is higher than this number, force to flush data
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -864,24 +942,28 @@ limitations under the License.
Hash aggregation will be turned off if the ratio between hash table size and input rows is bigger than this number.
Set to 1 to make sure hash aggregation is never turned off.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.merge.mapfiles</name>
<value>true</value>
<description>Merge small files at the end of a map-only job</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.merge.mapredfiles</name>
<value>false</value>
<description>Merge small files at the end of a map-reduce job</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.merge.size.per.task</name>
<value>256000000</value>
<description>Size of merged files at the end of the job</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -892,12 +974,14 @@ limitations under the License.
map-reduce job to merge the output files into bigger files. This is only done for map-only jobs
if hive.merge.mapfiles is true, and for map-reduce jobs if hive.merge.mapredfiles is true.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.merge.rcfile.block.level</name>
<value>true</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -909,6 +993,7 @@ limitations under the License.
for small ORC files. Note that enabling this config will not honor padding tolerance
config (hive.exec.orc.block.padding.tolerance).
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -916,6 +1001,7 @@ limitations under the License.
<value>67108864</value>
<description>Define the default ORC stripe size</description>
<display-name>Default ORC Stripe Size</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>8388608</minimum>
@@ -930,6 +1016,7 @@ limitations under the License.
<value>ZLIB</value>
<description>Define the default compression codec for ORC file</description>
<display-name>ORC Compression Algorithm</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -954,6 +1041,7 @@ limitations under the License.
compression level of higher level compression codec (like ZLIB).
</description>
<display-name>ORC Compression Strategy</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -986,6 +1074,7 @@ limitations under the License.
options are SPEED and COMPRESSION.
</description>
<display-name>ORC Encoding Strategy</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1015,18 +1104,21 @@ limitations under the License.
If turned on splits generated by orc will include metadata about the stripes in the file. This
data is read remotely (from the client or HS2 machine) and sent to all the tasks.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.orc.compute.splits.num.threads</name>
<value>10</value>
<description>How many threads orc should use to create splits in parallel.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.limit.optimize.enable</name>
<value>true</value>
<description>Whether to enable to optimization to trying a smaller subset of data for simple LIMIT first.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1034,6 +1126,7 @@ limitations under the License.
<value>true</value>
<description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description>
<display-name>Enforce bucketing</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1060,22 +1153,26 @@ limitations under the License.
<name>hive.enforce.sortmergebucketmapjoin</name>
<value>true</value>
<description>If the user asked for sort-merge bucketed map-side join, and it cannot be performed, should the query fail or not ?</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.constant.propagation</name>
<value>true</value>
<description>Whether to enable constant propagation optimizer</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.metadataonly</name>
<value>true</value>
<description/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.null.scan</name>
<value>true</value>
<description>Dont scan relations which are guaranteed to not generate any rows</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1087,6 +1184,7 @@ limitations under the License.
in the reducer thereby reducing the memory pressure on reducers.
</description>
<display-name>Sort Partitions Dynamically</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1107,6 +1205,7 @@ limitations under the License.
<name>hive.stats.autogather</name>
<value>true</value>
<description>A flag to gather statistics automatically during the INSERT OVERWRITE command.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.stats.dbclass</name>
@@ -1115,6 +1214,7 @@ limitations under the License.
Expects one of the pattern in [jdbc(:.*), hbase, counter, custom, fs].
The storage that stores temporary Hive statistics. Currently, jdbc, hbase, counter and custom type are supported.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1129,6 +1229,7 @@ limitations under the License.
and will estimate the number of rows from row schema.
</description>
<display-name>Fetch partition stats at compiler</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1165,6 +1266,7 @@ limitations under the License.
of column statistics from metastore.
</description>
<display-name>Fetch column stats at compiler</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1195,12 +1297,14 @@ limitations under the License.
<name>hive.zookeeper.client.port</name>
<value>2181</value>
<description>The port of ZooKeeper servers to talk to. If the list of Zookeeper servers specified in hive.zookeeper.quorum,does not contain port numbers, this value is used.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.zookeeper.namespace</name>
<value>hive_zookeeper_namespace</value>
<description>The parent node under which all ZooKeeper nodes are created.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1208,6 +1312,7 @@ limitations under the License.
<value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value>
<description/>
<display-name>Transaction Manager</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1239,6 +1344,7 @@ limitations under the License.
streaming data into Hive. But it will also increase the number of
open transactions at any given time, possibly impacting read performance.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1248,6 +1354,7 @@ limitations under the License.
Support concurrency and use locks, needed for Transactions. Requires Zookeeper.
</description>
<display-name>Use Locking</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1276,6 +1383,7 @@ limitations under the License.
<description>
Whether to print the names of the columns in query output.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1286,6 +1394,7 @@ limitations under the License.
Time before a given compaction in working state is declared a failure
and returned to the initiated state.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.check.interval</name>
@@ -1295,12 +1404,14 @@ limitations under the License.
Time between checks to see if any partitions need compacted.
This should be kept high because each check for compaction requires many calls against the NameNode.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.delta.pct.threshold</name>
<value>0.1f</value>
<description>Percentage (by size) of base that deltas can be before major compaction is initiated.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.fetch.task.conversion</name>
@@ -1314,6 +1425,7 @@ limitations under the License.
1. minimal : SELECT STAR, FILTER on partition columns, LIMIT only
2. more : SELECT, FILTER, LIMIT only (support TABLESAMPLE and virtual columns)
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.fetch.task.conversion.threshold</name>
@@ -1323,6 +1435,7 @@ limitations under the License.
is calculated by summation of file lengths. If it's not native, storage handler for the table
can optionally implement org.apache.hadoop.hive.ql.metadata.InputEstimator interface.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.fetch.task.aggr</name>
@@ -1332,6 +1445,7 @@ limitations under the License.
final aggregations in single reduce task. If this is set true, Hive delegates final aggregation
stage to fetch task, possibly decreasing the query time.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1341,6 +1455,7 @@ limitations under the License.
The Hive client authorization manager class name. The user defined authorization class should implement
interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -1353,6 +1468,7 @@ limitations under the License.
<name>hive.security.metastore.authorization.auth.reads</name>
<value>true</value>
<description>If this is true, metastore authorizer authorizes read actions on database, table</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.metastore.authenticator.manager</name>
@@ -1361,29 +1477,34 @@ limitations under the License.
authenticator manager class name to be used in the metastore for authentication.
The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.logging.operation.enabled</name>
<value>true</value>
<description>When true, HS2 will save operation logs</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.logging.operation.log.location</name>
<value>/tmp/hive/operation_logs</value>
<description>Top level directory where operation logs are stored if logging functionality is enabled</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.thrift.http.port</name>
<value>10001</value>
<description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'http'.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.thrift.http.path</name>
<value>cliservice</value>
<description>Path component of URL endpoint when in HTTP mode.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1398,18 +1519,21 @@ limitations under the License.
"auth-conf" - authentication plus integrity and confidentiality protection
This is applicable only if HiveServer2 is configured to use Kerberos authentication.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.thrift.max.worker.threads</name>
<value>500</value>
<description>Maximum number of Thrift worker threads</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.allow.user.substitution</name>
<value>true</value>
<description>Allow alternate user to be specified as part of HiveServer2 open connection request.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1427,6 +1551,7 @@ limitations under the License.
hive.server2.authentication.spnego.keytab
are specified.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1439,6 +1564,7 @@ limitations under the License.
and HTTP transport mode is used.
This needs to be set only if SPNEGO is to be used in authentication.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
@@ -1452,6 +1578,7 @@ limitations under the License.
HIVE : Exposes Hive's native table types like MANAGED_TABLE, EXTERNAL_TABLE, VIRTUAL_VIEW
CLASSIC : More generic types like TABLE and VIEW
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1459,6 +1586,7 @@ limitations under the License.
<value>false</value>
<description/>
<display-name>Use SSL</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1479,10 +1607,12 @@ limitations under the License.
<name>hive.server2.keystore.path</name>
<value>/etc/security/keystores/hs2keystore.jks</value>
<description>SSL certificate keystore location</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.keystore.password</name>
<value>password</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>SSL certificate keystore password</description>
</property>
@@ -1491,6 +1621,7 @@ limitations under the License.
<name>hive.conf.restricted.list</name>
<value>hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role</value>
<description>Comma separated list of configuration options which are immutable at runtime</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1500,6 +1631,7 @@ limitations under the License.
Max number of entries in the vector group by aggregation hashtables.
Exceeding this will trigger a flush irrelevant of memory pressure condition.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1507,6 +1639,7 @@ limitations under the License.
<value>false</value>
<description>Enables container prewarm for Tez (Hadoop 2 only)</description>
<display-name>Hold Containers to Reduce Latency</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1528,6 +1661,7 @@ limitations under the License.
<value>3</value>
<description>Controls the number of containers to prewarm for Tez (Hadoop 2 only)</description>
<display-name>Number of Containers Held</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>1</minimum>
@@ -1544,6 +1678,7 @@ limitations under the License.
query execution.
</description>
<display-name>Enable Reduce Vectorization</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1567,6 +1702,7 @@ limitations under the License.
Chooses execution engine. Option is: mr (Map reduce, default)
</description>
<display-name>hive.execution.engine</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1583,12 +1719,14 @@ limitations under the License.
<name>hive.vectorized.groupby.checkinterval</name>
<value>4096</value>
<description>Number of entries added to the group by aggregation hash before a recomputation of average entry size is performed.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.vectorized.groupby.flush.percent</name>
<value>0.1</value>
<description>Percent of entries in the group by aggregation hash flushed when the memory threshold is exceeded.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1600,6 +1738,7 @@ limitations under the License.
For more advanced stats collection need to run analyze table queries.
</description>
<display-name>Compute simple queries using stats only</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1626,12 +1765,14 @@ limitations under the License.
<name>hive.limit.pushdown.memory.usage</name>
<value>0.04</value>
<description>The max memory to be used for hash in RS operator for top K selection.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.txn.timeout</name>
<value>300</value>
<description>Time after which transactions are declared aborted if the client has not sent a heartbeat, in seconds.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1639,6 +1780,7 @@ limitations under the License.
<value>false</value>
<description>Whether to run the compactor's initiator thread in this metastore instance or not. If there is more than one instance of the thrift metastore this should only be set to true for one of them.</description>
<display-name>Run Compactor</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
@@ -1666,6 +1808,7 @@ limitations under the License.
<value>0</value>
<description>Number of compactor worker threads to run on this metastore instance. Can be different values on different metastore instances.</description>
<display-name>Number of threads used by Compactor</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -1684,18 +1827,21 @@ limitations under the License.
<name>hive.compactor.delta.num.threshold</name>
<value>10</value>
<description>Number of delta files that must exist in a directory before the compactor will attempt a minor compaction.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.compactor.abortedtxn.threshold</name>
<value>1000</value>
<description>Number of aborted transactions involving a particular table or partition before major compaction is initiated.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>datanucleus.cache.level2.type</name>
<value>none</value>
<description>Determines caching mechanism DataNucleus L2 cache will use. It is strongly recommended to use default value of 'none' as other values may cause consistency errors in Hive.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1704,6 +1850,7 @@ limitations under the License.
<description>The maximum number of bytes that a query using the compact index can read.
Negative value is equivalent to infinity.
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1711,18 +1858,20 @@ limitations under the License.
<value>true</value>
<description>Set this to true if table directories should inherit the permissions of the warehouse or database directory instead of being created with permissions derived from dfs umask
</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.start.cleanup.scratchdir</name>
<value>true</value>
<description>To cleanup the hive scratchdir while starting the hive server.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.authentication.ldap.url</name>
<value> </value>
- <property-type>DONT_ADD_ON_UPGRADE</property-type>
+ <on-ambari-upgrade add="false"/>
<depends-on>
<property>
<type>hive-site</type>
@@ -1732,7 +1881,7 @@ limitations under the License.
</property>
<property>
<name>hive.server2.authentication.ldap.baseDN</name>
- <property-type>DONT_ADD_ON_UPGRADE</property-type>
+ <on-ambari-upgrade add="false"/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -1746,7 +1895,7 @@ limitations under the License.
<property>
<name>hive.server2.authentication.kerberos.keytab</name>
<value>/etc/security/keytabs/hive.service.keytab</value>
- <property-type>DONT_ADD_ON_UPGRADE</property-type>
+ <on-ambari-upgrade add="false"/>
<depends-on>
<property>
<type>hive-site</type>
@@ -1757,7 +1906,7 @@ limitations under the License.
<property>
<name>hive.server2.authentication.kerberos.principal</name>
<value>hive/_HOST@EXAMPLE.COM</value>
- <property-type>DONT_ADD_ON_UPGRADE</property-type>
+ <on-ambari-upgrade add="false"/>
<depends-on>
<property>
<type>hive-site</type>
@@ -1768,7 +1917,7 @@ limitations under the License.
<property>
<name>hive.server2.authentication.pam.services</name>
<value></value>
- <property-type>DONT_ADD_ON_UPGRADE</property-type>
+ <on-ambari-upgrade add="false"/>
<depends-on>
<property>
<type>hive-site</type>
@@ -1779,7 +1928,7 @@ limitations under the License.
<property>
<name>hive.server2.custom.authentication.class</name>
<value></value>
- <property-type>DONT_ADD_ON_UPGRADE</property-type>
+ <on-ambari-upgrade add="false"/>
<depends-on>
<property>
<type>hive-site</type>
@@ -1791,10 +1940,12 @@ limitations under the License.
<property>
<name>datanucleus.autoCreateSchema</name>
<value>false</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>datanucleus.fixedDatastore</name>
<value>true</value>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -1805,5 +1956,6 @@ limitations under the License.
External tables will be created with default file format. Leaving this null
will result in using the default file format for all 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/HIVE/configuration/hiveserver2-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml
index 0b6686f..bf34fce 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml
@@ -23,6 +23,7 @@ limitations under the License.
<name>hive.security.authenticator.manager</name>
<value>org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator</value>
<description>Hive client authenticator manager class name. The user-defined authenticator class should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. </description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -36,6 +37,7 @@ limitations under the License.
<value>org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory</value>
<description>the hive client authorization manager class name.
The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description>
+ <on-ambari-upgrade add="true"/>
<depends-on>
<property>
<type>hive-env</type>
@@ -49,6 +51,7 @@ limitations under the License.
<value>false</value>
<description>enable or disable the Hive client authorization</description>
<display-name>Enable Authorization</display-name>
+ <on-ambari-upgrade add="true"/>
<value-attributes>
<type>value-list</type>
<entries>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml
index c7945f3..316ebbe 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-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/hive/audit/db/spool</value>
<description>/var/log/hive/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/hive/audit/hdfs/spool</value>
<description>/var/log/hive/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/hive/audit/solr/spool</value>
<description>/var/log/hive/audit/solr/spool</description>
+ <on-ambari-upgrade add="true"/>
</property>
-->
@@ -169,6 +184,7 @@
<value>false</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/HIVE/configuration/ranger-hive-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
index 89c99a1..7cc6076 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
@@ -25,18 +25,21 @@
<value>ambari-qa</value>
<display-name>Policy user for HIVE</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>jdbc.driverClassName</name>
<value>org.apache.hive.jdbc.HiveDriver</value>
<description>Used for repository creation on ranger admin</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<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>
@@ -47,12 +50,14 @@
<value>hive</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>hive</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>
@@ -61,132 +66,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/HIVE/configuration/ranger-hive-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
index 581dad5..87541ce 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
@@ -24,11 +24,13 @@
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/iop/current/hive-server2/conf/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.keystore.password</name>
<value>myKeyFilePassword</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
</property>
@@ -37,11 +39,13 @@
<name>xasecure.policymgr.clientssl.truststore</name>
<value>/usr/iop/current/hive-server2/conf/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.password</name>
<value>changeit</value>
+ <on-ambari-upgrade add="true"/>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
</property>
@@ -50,12 +54,14 @@
<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>
\ 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/HIVE/configuration/ranger-hive-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml
index 759173b..b78bda9 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml
@@ -24,36 +24,42 @@
<name>ranger.plugin.hive.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this Hive instance</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ranger.plugin.hive.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.hive.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.hive.policy.rest.ssl.config.file</name>
<value>/usr/iop/current/hive-server2/conf/conf.server/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.hive.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.hive.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>
@@ -61,6 +67,7 @@
<value>true</value>
<display-name>Should Hive GRANT/REVOKE update XA policies</display-name>
<description>Should Hive 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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml
index efeebc6..5b509a1 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml
@@ -49,6 +49,7 @@ CONSOLE_LOG={{templeton_log_dir}}/webhcat-console.log
# Set HADOOP_HOME to point to a specific hadoop install directory
export HADOOP_HOME=${HADOOP_HOME:-{{hadoop_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/HIVE/configuration/webhcat-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml
index 6f1b21f..68cea1e 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml
@@ -73,6 +73,7 @@ log4j.logger.org.apache.zookeeper = WARN
log4j.logger.org.eclipse.jetty = 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/HIVE/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml
index e35ff6f..7bb03c5 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml
@@ -27,36 +27,42 @@ 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>
<name>templeton.jar</name>
<value>/usr/iop/${iop.version}/hive/share/webhcat/svr/lib/hive-webhcat-*.jar</value>
<description>The path to the Templeton jar file.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>templeton.libjars</name>
<value>/usr/iop/${iop.version}/zookeeper/zookeeper.jar,/usr/iop/${iop.version}/hive/lib/hive-common.jar</value>
<description>Jars to add the the classpath.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>templeton.hadoop</name>
<value>/usr/iop/${iop.version}/hadoop/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>
@@ -66,18 +72,21 @@ limitations under the License.
<name>templeton.pig.path</name>
<value>/usr/iop/${iop.version}/pig/bin/pig</value>
<description>The path to the Pig executable.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>templeton.hcat</name>
<value>/usr/iop/${iop.version}/hive/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>
@@ -87,36 +96,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>/usr/iop/${iop.version}/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:9083,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>/usr/iop/${iop.version}/sqoop/bin/sqoop</value>
<description>The path to the Sqoop executable.</description>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
@@ -125,12 +140,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>
@@ -140,24 +157,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>
[08/10] ambari git commit: AMBARI-21431. Update BigInsight
configuration files to be compliant with XSD
Posted by ad...@apache.org.
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>