You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/06/09 15:01:52 UTC
[27/70] ambari git commit: AMBARI-17112. Fixed implementation of
on-ambari-upgrade support. Update all stack configuration xmls to pass
validation. Change defaults (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
index aa95dee..85a1eba 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
@@ -40,7 +40,7 @@
<name>mapreduce.map.memory.mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.map.sort.spill.percent</name>
@@ -52,7 +52,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.task.io.sort.factor</name>
@@ -61,7 +61,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- map/reduce properties -->
<property>
@@ -70,7 +70,7 @@
<description>
Administrators for MapReduce applications.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.shuffle.parallelcopies</name>
@@ -79,7 +79,7 @@
The default number of parallel transfers run by reduce during
the copy(shuffle) phase.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.map.speculative</name>
@@ -88,7 +88,7 @@
If true, then multiple instances of some map tasks
may be executed in parallel.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.speculative</name>
@@ -97,7 +97,7 @@
If true, then multiple instances of some reduce tasks may be
executed in parallel.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.job.reduce.slowstart.completedmaps</name>
@@ -106,7 +106,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.job.counters.max</name>
@@ -114,7 +114,7 @@
<description>
Limit on the number of counters allowed per job.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.shuffle.merge.percent</name>
@@ -125,7 +125,7 @@
storing in-memory map outputs, as defined by
mapreduce.reduce.shuffle.input.buffer.percent.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.shuffle.input.buffer.percent</name>
@@ -134,7 +134,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.output.fileoutputformat.compress.type</name>
@@ -143,7 +143,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.input.buffer.percent</name>
@@ -154,7 +154,7 @@
remaining map outputs in memory must consume less than this threshold before
the reduce can begin.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- copied from kryptonite configuration -->
<property>
@@ -163,7 +163,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.task.timeout</name>
@@ -173,7 +173,7 @@
terminated if it neither reads an input, writes an output, nor
updates its status string.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.map.memory.mb</name>
@@ -197,7 +197,7 @@
<name>yarn.scheduler.minimum-allocation-mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.memory.mb</name>
@@ -221,7 +221,7 @@
<name>yarn.scheduler.minimum-allocation-mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.shuffle.port</name>
@@ -231,7 +231,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.intermediate-done-dir</name>
@@ -239,7 +239,7 @@
<description>
Directory where history files are written by MapReduce jobs.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.done-dir</name>
@@ -248,21 +248,21 @@
Directory where history files are managed by the MR JobHistory Server.
</description>
<property-type>NOT_MANAGED_HDFS_PATH</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.address</name>
<value>localhost:10020</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Enter your JobHistoryServer hostname.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.webapp.address</name>
<value>localhost:19888</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Enter your JobHistoryServer hostname.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.framework.name</name>
@@ -271,7 +271,7 @@
The runtime framework for executing MapReduce jobs. Can be one of local,
classic or yarn.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.app.mapreduce.am.staging-dir</name>
@@ -279,7 +279,7 @@
<description>
The staging dir used while submitting jobs.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.app.mapreduce.am.resource.mb</name>
@@ -303,7 +303,7 @@
<name>yarn.scheduler.minimum-allocation-mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.app.mapreduce.am.command-opts</name>
@@ -328,7 +328,7 @@
<name>yarn.app.mapreduce.am.resource.mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.app.mapreduce.am.admin-command-opts</name>
@@ -350,25 +350,25 @@
<name>yarn.app.mapreduce.am.resource.mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.app.mapreduce.am.log.level</name>
<value>INFO</value>
<description>MR App Master process log level.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <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</value>
<description>This property stores Java options for map tasks.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <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</value>
<description>This property stores Java options for reduce tasks.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.application.classpath</name>
@@ -377,7 +377,7 @@
CLASSPATH for MR applications. A comma-separated list of CLASSPATH
entries.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.am.max-attempts</name>
@@ -388,7 +388,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.map.java.opts</name>
@@ -403,7 +403,7 @@
<name>mapreduce.map.memory.mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.java.opts</name>
@@ -418,7 +418,7 @@
<name>mapreduce.reduce.memory.mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.map.log.level</name>
@@ -427,7 +427,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.reduce.log.level</name>
@@ -436,7 +436,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.admin.user.env</name>
@@ -446,7 +446,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.output.fileoutputformat.compress</name>
@@ -454,7 +454,7 @@
<description>
Should the job outputs be compressed?
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>mapreduce.jobhistory.http.policy</name>
@@ -464,6 +464,6 @@
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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml
index 1e54e17..b4fedd8 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml
@@ -23,7 +23,7 @@
Maximum number of applications that can be pending and running.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.maximum-am-resource-percent</name>
@@ -34,7 +34,7 @@
applications.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.queues</name>
@@ -43,7 +43,7 @@
The queues at the this level (root is the root queue).
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.capacity</name>
@@ -55,14 +55,14 @@
or less.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.default.capacity</name>
<value>100</value>
<description>Default queue target capacity.</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.default.user-limit-factor</name>
@@ -71,7 +71,7 @@
Default queue user limit a percentage from 0.0 to 1.0.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.default.maximum-capacity</name>
@@ -80,7 +80,7 @@
The maximum capacity of the default queue.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.default.state</name>
@@ -89,7 +89,7 @@
The state of the default queue. State can be one of RUNNING or STOPPED.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
@@ -98,7 +98,7 @@
The ACL of who can submit jobs to the default queue.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.default.acl_administer_jobs</name>
@@ -107,7 +107,7 @@
The ACL of who can administer jobs on the default queue.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.root.acl_administer_queue</name>
@@ -117,7 +117,7 @@
allocations.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.node-locality-delay</name>
@@ -129,7 +129,7 @@
approximately number of nodes in one rack which is 40.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.capacity.default.minimum-user-limit-percent</name>
@@ -138,6 +138,6 @@
Default minimum queue resource limit depends on the number of users who have submitted applications.
</description>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
index 6a5224d..929f672 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
@@ -29,7 +29,7 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn_pid_dir_prefix</name>
@@ -41,7 +41,7 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn_user</name>
@@ -53,7 +53,7 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn_heapsize</name>
@@ -64,7 +64,7 @@
<type>int</type>
<unit>MB</unit>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>resourcemanager_heapsize</name>
@@ -76,7 +76,7 @@
<overridable>false</overridable>
<unit>MB</unit>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>nodemanager_heapsize</name>
@@ -87,7 +87,7 @@
<type>int</type>
<unit>MB</unit>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>min_user_id</name>
@@ -97,25 +97,25 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>is_supported_yarn_ranger</name>
<value>false</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" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- yarn-env.sh -->
<property>
@@ -240,7 +240,7 @@ YARN_OPTS="$YARN_OPTS -Djava.io.tmpdir={{hadoop_java_io_tmpdir}}"
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>service_check.queue.name</name>
@@ -248,6 +248,6 @@ YARN_OPTS="$YARN_OPTS -Djava.io.tmpdir={{hadoop_java_io_tmpdir}}"
<description>
The queue that used by service check.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
index dc5ffae..89dd52d 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml
@@ -89,6 +89,6 @@ log4j.appender.NMAUDIT.DatePattern=.yyyy-MM-dd
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
index 48c2443..b1b30aa 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
@@ -24,21 +24,21 @@
<value>localhost</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The hostname of the RM.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.resource-tracker.address</name>
<value>localhost:8025</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description> The address of ResourceManager. </description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.scheduler.address</name>
<value>localhost:8030</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The address of the scheduler interface.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.address</name>
@@ -48,20 +48,20 @@
The address of the applications manager interface in the
RM.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.admin.address</name>
<value>localhost:8141</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The address of the RM admin interface.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.minimum-allocation-mb</name>
@@ -85,7 +85,7 @@
<name>yarn.nodemanager.resource.memory-mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.scheduler.maximum-allocation-mb</name>
@@ -109,7 +109,7 @@
<name>yarn.nodemanager.resource.memory-mb</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.acl.enable</name>
@@ -118,7 +118,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.admin.acl</name>
@@ -127,14 +127,14 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- NodeManager -->
<property>
<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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.resource.memory-mb</name>
@@ -149,13 +149,13 @@
<unit>MB</unit>
<increment-step>256</increment-step>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.application.classpath</name>
<value>/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*</value>
<description>Classpath for typical applications.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.vmem-pmem-ratio</name>
@@ -172,13 +172,13 @@
<maximum>5.0</maximum>
<increment-step>0.1</increment-step>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.linux-container-executor.group</name>
@@ -190,20 +190,20 @@
<name>user_group</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.aux-services</name>
<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" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.log-dirs</name>
@@ -218,7 +218,7 @@
<value-attributes>
<type>directories</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.local-dirs</name>
@@ -233,7 +233,7 @@
<value-attributes>
<type>directories</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.container-monitor.interval-ms</name>
@@ -242,7 +242,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
<property>
@@ -255,13 +255,13 @@
<name>yarn.nodemanager.health-checker.interval-ms</name>
<value>135000</value>
<description>Frequency of running node health script.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.log.retain-second</name>
@@ -270,7 +270,7 @@
Time in seconds to retain user logs. Only applicable if
log aggregation is disabled.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.log-aggregation-enable</name>
@@ -280,14 +280,14 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.remote-app-log-dir</name>
<value>/app-logs</value>
<description>Location to aggregate logs to. </description>
<property-type>NOT_MANAGED_HDFS_PATH</property-type>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.remote-app-log-dir-suffix</name>
@@ -296,7 +296,7 @@
The remote log dir will be created at
{yarn.nodemanager.remote-app-log-dir}/${user}/{thisParam}.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.log-aggregation.compression-type</name>
@@ -304,7 +304,7 @@
<description>
T-file compression types used to compress aggregated logs.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.delete.debug-delay-sec</name>
@@ -324,7 +324,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.log-aggregation.retain-seconds</name>
@@ -333,7 +333,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.admin-env</name>
@@ -342,7 +342,7 @@
Environment variables that should be forwarded from the NodeManager's
environment to the container's.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.disk-health-checker.min-healthy-disks</name>
@@ -354,7 +354,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.am.max-attempts</name>
@@ -367,7 +367,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.webapp.address</name>
@@ -376,7 +376,7 @@
<description>
The address of the RM web application.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.webapp.https.address</name>
@@ -385,7 +385,7 @@
<description>
The https address of the RM web application.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.vmem-check-enabled</name>
@@ -393,7 +393,7 @@
<description>
Whether virtual memory limits will be enforced for containers.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.log.server.url</name>
@@ -402,7 +402,7 @@
<description>
URI for the HistoryServer's log resource
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.nodes.exclude-path</name>
@@ -413,7 +413,7 @@
file must be specified. If the value is empty, no hosts are
excluded.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.http.policy</name>
@@ -421,6 +421,6 @@
<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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml
index d6bca1d..69bb187 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml
@@ -22,7 +22,7 @@
<name>zeppelin.server.addr</name>
<value>0.0.0.0</value>
<description>Server address</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.server.port</name>
@@ -30,13 +30,13 @@
<description>Server port.The subsequent port (e.g. 9996) should also be open as it will be
used by the web socket
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.notebook.dir</name>
<value>notebook</value>
<description>notebook persist</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.notebook.homescreen</name>
@@ -44,13 +44,13 @@
<description>id of notebook to be displayed in homescreen. e.g.) 2A94M5J1Z Empty value
displays default home screen
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.notebook.homescreen.hide</name>
<value>false</value>
<description>hide homescreen notebook from list when this value set to true</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.notebook.s3.user</name>
@@ -58,7 +58,7 @@
<description>user name for s3 folder structure. If S3 is used to store the notebooks, it is
necessary to use the following folder structure bucketname/username/notebook/
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.notebook.s3.bucket</name>
@@ -66,7 +66,7 @@
<description>bucket name for notebook storage. If S3 is used to store the notebooks, it is
necessary to use the following folder structure bucketname/username/notebook/
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.notebook.storage</name>
@@ -76,13 +76,13 @@
notebooks, it is necessary to use the following folder structure
bucketname/username/notebook/
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.interpreter.dir</name>
<value>interpreter</value>
<description>Interpreter implementation base directory</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.interpreters</name>
@@ -90,57 +90,57 @@
<description>Comma separated interpreter configurations. First interpreter become a
default
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.interpreter.connect.timeout</name>
<value>30000</value>
<description>Interpreter process connect timeout in msec.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl</name>
<value>false</value>
<description>Should SSL be used by the servers?</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl.client.auth</name>
<value>false</value>
<description>Should client authentication be used for SSL connections?</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl.keystore.path</name>
<value>conf/keystore</value>
<description>Path to keystore relative to Zeppelin home</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl.keystore.type</name>
<value>JKS</value>
<description>The format of the given keystore (e.g. JKS or PKCS12)</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl.keystore.password</name>
<value>change me</value>
<description>Keystore password. Can be obfuscated by the Jetty Password tool</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl.key.manager.password</name>
<value>change me</value>
<description>Key Manager password. Defaults to keystore password. Can be obfuscated.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl.truststore.path</name>
<value>conf/truststore</value>
<description>Path to truststore relative to Zeppelin home. Defaults to the keystore path
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl.truststore.type</name>
@@ -148,7 +148,7 @@
<description>The format of the given truststore (e.g. JKS or PKCS12). Defaults to the same
type as the keystore type
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.ssl.truststore.password</name>
@@ -156,7 +156,7 @@
<description>Truststore password. Can be obfuscated by the Jetty Password tool. Defaults to
the keystore password
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.server.allowed.origins</name>
@@ -165,18 +165,18 @@
http://onehost:8080,http://otherhost.com). If you leave * you are vulnerable to
https://issues.apache.org/jira/browse/ZEPPELIN-173
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.anonymous.allowed</name>
<value>true</value>
<description>Anonymous user allowed by default</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.websocket.max.text.message.size</name>
<value>1024000</value>
<description>Size in characters of the maximum text message to be received by websocket. Defaults to 1024000</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index e079554..c22eead 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -21,27 +21,27 @@
<name>zeppelin_pid_dir</name>
<value>/var/run/zeppelin-notebook</value>
<description>Dir containing process ID file</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin_user</name>
<value>zeppelin</value>
<property-type>USER</property-type>
<description>User zeppelin daemon runs as</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin_group</name>
<value>zeppelin</value>
<property-type>GROUP</property-type>
<description>zeppelin group</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin_log_dir</name>
<value>/var/log/zeppelin</value>
<description>Zeppelin Log dir</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin_env_content</name>
@@ -135,7 +135,7 @@ export SPARK_YARN_USER_ENV="PYTHONPATH=${PYTHONPATH}"
# export ZEPPELIN_SPARK_MAXRESULT
</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>shiro_ini_content</name>
@@ -169,7 +169,7 @@ shiro.loginUrl = /api/login
/** = anon
#/** = authc
</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>log4j_properties_content</name>
@@ -186,19 +186,19 @@ log4j.appender.dailyfile.File = ${zeppelin.log.file}
log4j.appender.dailyfile.layout = org.apache.log4j.PatternLayout
log4j.appender.dailyfile.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m%n
</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.executor.mem</name>
<value>512m</value>
<description>Executor memory to use (e.g. 512m or 1g)</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.executor.instances</name>
<value>2</value>
<description>Number of executor instances to use (e.g. 2)</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zeppelin.spark.jar.dir</name>
@@ -206,6 +206,6 @@ log4j.appender.dailyfile.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m
<description>Shared location where zeppelin spark jar will be copied to. Should be accesible
by all cluster nodes
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml
index 41bc60a..99421c0 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml
@@ -30,7 +30,7 @@
<overridable>false</overridable>
<unit>ms</unit>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>initLimit</name>
@@ -41,7 +41,7 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>syncLimit</name>
@@ -52,7 +52,7 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>clientPort</name>
@@ -63,7 +63,7 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dataDir</name>
@@ -73,7 +73,7 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>autopurge.snapRetainCount</name>
@@ -81,13 +81,13 @@
<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" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
index 3be05ad..696b28a 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml
@@ -30,7 +30,7 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zk_log_dir</name>
@@ -41,7 +41,7 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zk_pid_dir</name>
@@ -53,7 +53,7 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zk_server_heapsize</name>
@@ -67,17 +67,17 @@
<unit>MB</unit>
<increment-step>256</increment-step>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper_principal_name</name>
<description>ZooKeeper principal name</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper_keytab_path</name>
<description>ZooKeeper keytab path</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- zookeeper-env.sh -->
<property>
@@ -101,6 +101,6 @@ export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml
index 25c7912..70e86d7 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml
@@ -99,6 +99,6 @@ log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/configuration-schema.xsd
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/configuration-schema.xsd b/ambari-server/src/main/resources/configuration-schema.xsd
index d49cbf8..6716dd5 100644
--- a/ambari-server/src/main/resources/configuration-schema.xsd
+++ b/ambari-server/src/main/resources/configuration-schema.xsd
@@ -41,7 +41,6 @@
<xs:element name="deleted" type="xs:boolean" minOccurs="0"/>
<xs:element name="final" type="xs:boolean" minOccurs="0"/>
<xs:element name="on-ambari-upgrade" type="propertyUpgradeBehavior" minOccurs="1"/>
- <xs:element name="on-stack-upgrade" type="propertyUpgradeBehavior" minOccurs="1"/>
<xs:element name="property-type" minOccurs="0">
<xs:simpleType>
<xs:list itemType="propertyType"/>
@@ -68,9 +67,9 @@
</xs:complexType>
<xs:complexType name="propertyUpgradeBehavior">
- <xs:attribute name="add" type="xs:boolean" use="required"/>
- <xs:attribute name="delete" type="xs:boolean" use="required"/>
- <xs:attribute name="change" type="xs:boolean" use="required"/>
+ <xs:attribute name="add" type="xs:boolean" use="optional" default="true"/>
+ <xs:attribute name="delete" type="xs:boolean" use="optional"/>
+ <xs:attribute name="change" type="xs:boolean" use="optional"/>
</xs:complexType>
<xs:complexType name="valueAttributesInfo">
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh b/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh
index 550f1c2..fae9fe8 100644
--- a/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh
+++ b/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh
@@ -28,6 +28,4 @@ do
`xmlstarlet ed --inplace --subnode "/configuration/property" -t 'elem' -n "on-ambari-upgrade" $i`;
`xmlstarlet ed --inplace --subnode "/configuration/property/on-ambari-upgrade" -t 'attr' -n "add" -v "true" $i`;
- `xmlstarlet ed --inplace --subnode "/configuration/property/on-ambari-upgrade" -t 'attr' -n "update" -v "false" $i`;
- `xmlstarlet ed --inplace --subnode "/configuration/property/on-ambari-upgrade" -t 'attr' -n "delete" -v "false" $i`;
done
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
index 9cddcb4..2830682 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
@@ -24,13 +24,13 @@
<name>security_enabled</name>
<value>false</value>
<description>Hadoop Security</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kerberos_domain</name>
<value>EXAMPLE.COM</value>
<description>Kerberos realm.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ignore_groupsusers_create</name>
@@ -39,7 +39,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>smokeuser</name>
@@ -51,13 +51,13 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>smokeuser_keytab</name>
<value>/etc/security/keytabs/smokeuser.headless.keytab</value>
<description>Path to smoke test user keytab file</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>user_group</name>
@@ -69,6 +69,6 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml
index 123b58d..65067f2 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml
@@ -29,6 +29,6 @@
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
index 4431ba6..a68b364 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
@@ -24,13 +24,13 @@
<name>flume_conf_dir</name>
<value>/etc/flume/conf</value>
<description>Location to save configuration files</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>flume_log_dir</name>
<value>/var/log/flume</value>
<description>Location to save log files</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>flume_user</name>
@@ -42,7 +42,7 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- flume-env.sh -->
<property>
@@ -83,6 +83,6 @@ export JAVA_HOME={{java_home}}
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml
index bbd6335..0a29186 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml
@@ -29,6 +29,6 @@
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml
index e03b621..bed5751 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml
@@ -24,62 +24,62 @@
<name>ganglia_conf_dir</name>
<value>/etc/ganglia/hdp</value>
<description>Config directory for Ganglia</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ganglia_runtime_dir</name>
<value>/var/run/ganglia/hdp</value>
<description>Run directories for Ganglia</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>gmetad_user</name>
<value>nobody</value>
<property-type>USER GROUP</property-type>
<description>User </description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>gmond_user</name>
<value>nobody</value>
<property-type>USER GROUP</property-type>
<description>User </description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>rrdcached_base_dir</name>
<value>/var/lib/ganglia/rrds</value>
<description>Default directory for saving the rrd files on ganglia server</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>rrdcached_timeout</name>
<value>3600</value>
<description>(-w) Data is written to disk every timeout seconds. If this option is not specified the default interval of 300 seconds will be used.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>rrdcached_flush_timeout</name>
<value>7200</value>
<description>(-f) Every timeout seconds the entire cache is searched for old values which are written to disk. This only concerns files to which updates have stopped, so setting this to a high value, such as 3600 seconds, is acceptable in most cases. This timeout defaults to 3600 seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>rrdcached_delay</name>
<value>1800</value>
<description>(-z) If specified, rrdcached will delay writing of each RRD for a random number of seconds in the range [0,delay). This will avoid too many writes being queued simultaneously. This value should be no greater than the value specified in -w. By default, there is no delay.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>rrdcached_write_threads</name>
<value>4</value>
<description>(-t) Specifies the number of threads used for writing RRD files. The default is 4. Increasing this number will allow rrdcached to have more simultaneous I/O requests into the kernel. This may allow the kernel to re-order disk writes, resulting in better disk throughput.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>additional_clusters</name>
<value> </value>
<description>Add additional desired Ganglia metrics cluster in the form "name1:port1,name2:port2". Ensure that the names and ports are unique across all cluster and ports are available on ganglia server host. Ambari has reserved ports 8667-8669 within its own pool.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
index 8ad7954..56e74bf 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
@@ -27,7 +27,7 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_pid_dir</name>
@@ -36,13 +36,13 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_regionserver_heapsize</name>
<value>1024</value>
<description>HBase RegionServer Heap Size.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_regionserver_xmn_max</name>
@@ -52,19 +52,19 @@ Sets the upper bound on HBase RegionServers' young generation size.
This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize)
and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_master_heapsize</name>
<value>1024</value>
<description>HBase Master Heap Size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase_user</name>
@@ -76,7 +76,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- hbase-env.sh -->
<property>
@@ -152,6 +152,6 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml
index f5564a3..76f9ed5 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml
@@ -139,6 +139,6 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml
index 4198789..c1112bc 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml
@@ -28,7 +28,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.admin.protocol.acl</name>
@@ -38,7 +38,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security.masterregion.protocol.acl</name>
@@ -48,6 +48,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa1b536d/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml
index 8b99986..c3a8f86 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml
@@ -32,7 +32,7 @@
into /tmp. Change this configuration else all data will be lost
on machine restart.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.cluster.distributed</name>
@@ -42,13 +42,13 @@
false, startup will run all HBase and ZooKeeper daemons together
in the one JVM.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.port</name>
<value>60000</value>
<description>The port the HBase Master should bind to.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -61,33 +61,33 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -95,7 +95,7 @@
<description>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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.handler.count</name>
@@ -104,7 +104,7 @@
Same property is used by the Master for count of master handlers.
Default is 10.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.majorcompaction</name>
@@ -113,7 +113,7 @@
HStoreFiles in a region. Default: 1 day.
Set to 0 to disable automated major compactions.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.lowerLimit</name>
@@ -124,7 +124,7 @@
the minimum possible flushing to occur when updates are blocked due to
memstore limiting.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
@@ -136,7 +136,7 @@
resultant flush files take a long time to compact or split, or
worse, we OOME
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.flush.size</name>
@@ -146,7 +146,7 @@
exceeds this number of bytes. Value is checked by a thread that runs
every hbase.server.thread.wakefrequency.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.mslab.enabled</name>
@@ -157,7 +157,7 @@
heavy write loads. This can reduce the frequency of stop-the-world
GC pauses on large heaps.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -167,7 +167,7 @@
grown to exceed this value, the hosting HRegion is split in two.
Default: 1G.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.scanner.caching</name>
@@ -179,7 +179,7 @@
Do not set this value such that the time between invocations is greater
than the scanner timeout; i.e. hbase.regionserver.lease.period
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper.session.timeout</name>
@@ -191,7 +191,7 @@
"The client sends a requested timeout, the server responds with the
timeout that it can give the client. " In milliseconds.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.keyvalue.maxsize</name>
@@ -203,7 +203,7 @@
to set this to a fraction of the maximum region size. Setting it to zero
or less disables the check.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.compactionThreshold</name>
@@ -214,7 +214,7 @@
is run to rewrite all HStoreFiles files as one. Larger numbers
put off compaction but when it runs, it takes longer to complete.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.flush.retries.number</name>
@@ -222,7 +222,7 @@
<description>
The number of times the region flush operation will be retried.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.blockingStoreFiles</name>
@@ -233,7 +233,7 @@
blocked for this HRegion until a compaction is completed, or
until hbase.hstore.blockingWaitTime has been exceeded.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hfile.block.cache.size</name>
@@ -243,7 +243,7 @@
used by HFile/StoreFile. Default of 0.25 means allocate 25%.
Set to 0 to disable but it's not recommended.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Additional configuration specific to HBase security -->
<property>
@@ -253,7 +253,7 @@
full privileges, regardless of stored ACLs, across the cluster.
Only used when HBase security is enabled.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.security.authentication</name>
@@ -261,14 +261,14 @@
<description> Controls whether or not secure authentication is enabled for HBase. Possible values are 'simple'
(no authentication), and 'kerberos'.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.security.authorization</name>
<value>false</value>
<description>Enables HBase authorization. Set the value of this property to false to disable HBase authorization.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.coprocessor.region.classes</name>
@@ -279,7 +279,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.coprocessor.master.classes</name>
@@ -291,7 +291,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -299,7 +299,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
The following three properties are used together to create the list of
@@ -315,7 +315,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- End of properties used to generate ZooKeeper host:port quorum list. -->
<property>
@@ -328,7 +328,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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper.znode.parent</name>
@@ -338,18 +338,18 @@
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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.defaults.for.version.skip</name>
<value>true</value>
<description>Disables version verification.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <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" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>