You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2016/06/02 05:48:19 UTC
[10/98] [abbrv] [partial] ambari git commit: Revert "AMBARI-16272.
Ambari Upgrade shouldn't automatically add stack configs. Fix default upgrade
policy and script defaults (dlysnichenko)" - faling tests
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
index ab3be7f..8ad15dd 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
@@ -23,29 +23,29 @@
<name>io.sort.mb</name>
<value/>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>io.sort.record.percent</name>
<value>.2</value>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>io.sort.spill.percent</name>
<value/>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>io.sort.factor</name>
<value>100</value>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!-- map/reduce properties -->
<property>
@@ -57,8 +57,8 @@
killing them, and killing them very quickly (1/4 second) to guarantee
that we do not leave VMs around for later jobs.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.tracker.handler.count</name>
@@ -67,16 +67,16 @@
The number of server threads for the JobTracker. This should be roughly
4% of the number of tasktracker nodes.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.system.dir</name>
<value>/mapred/system</value>
<description>No description</description>
<final>true</final>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.tracker</name>
@@ -84,8 +84,8 @@
<value/>
<description>No description</description>
<final>true</final>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.tracker.http.address</name>
@@ -93,8 +93,8 @@
<value/>
<description>No description</description>
<final>true</final>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<!-- cluster specific -->
@@ -102,63 +102,63 @@
<value/>
<description>No description</description>
<final>true</final>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.cluster.administrators</name>
<value> hadoop</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.reduce.parallel.copies</name>
<value>30</value>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.tasktracker.map.tasks.maximum</name>
<value/>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.tasktracker.reduce.tasks.maximum</name>
<value/>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>tasktracker.http.threads</name>
<value>50</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.map.tasks.speculative.execution</name>
<value>false</value>
<description>If true, then multiple instances of some map tasks
may be executed in parallel.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.reduce.tasks.speculative.execution</name>
<value>false</value>
<description>If true, then multiple instances of some reduce tasks
may be executed in parallel.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.reduce.slowstart.completed.maps</name>
<value>0.05</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.inmem.merge.threshold</name>
@@ -169,8 +169,8 @@
0 indicates we want to DON'T have any threshold and instead depend only on
the ramfs's memory consumption to trigger the merge.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.shuffle.merge.percent</name>
@@ -180,8 +180,8 @@
storing in-memory map outputs, as defined by
mapred.job.shuffle.input.buffer.percent.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.shuffle.input.buffer.percent</name>
@@ -189,8 +189,8 @@
<description>The percentage of memory to be allocated from the maximum heap
size to storing map outputs during the shuffle.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.map.output.compression.codec</name>
@@ -198,8 +198,8 @@
<description>If the map outputs are compressed, how should they be
compressed
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.output.compression.type</name>
@@ -207,20 +207,20 @@
<description>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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.jobtracker.completeuserjobs.maximum</name>
<value>5</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.jobtracker.taskScheduler</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.jobtracker.restart.recover</name>
@@ -228,8 +228,8 @@
<description>"true" to enable (job) recovery upon restart,
"false" to start afresh
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.reduce.input.buffer.percent</name>
@@ -239,8 +239,8 @@
remaining map outputs in memory must consume less than this threshold before
the reduce can begin.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.reduce.input.limit</name>
@@ -249,15 +249,15 @@
is 10 Gb.) If the estimated input size of the reduce is greater than
this value, job is failed. A value of -1 means that there is no limit
set. </description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!-- copied from kryptonite configuration -->
<property>
<name>mapred.compress.map.output</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.task.timeout</name>
@@ -266,15 +266,15 @@
terminated if it neither reads an input, writes an output, nor
updates its status string.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>jetty.connector</name>
<value>org.mortbay.jetty.nio.SelectChannelConnector</value>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.task.tracker.task-controller</name>
@@ -282,69 +282,69 @@
<description>
TaskController which is used to launch and manage task execution.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.child.root.logger</name>
<value>INFO,TLA</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.child.java.opts</name>
<value/>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.cluster.map.memory.mb</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.cluster.reduce.memory.mb</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.map.memory.mb</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.reduce.memory.mb</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.cluster.max.map.memory.mb</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.cluster.max.reduce.memory.mb</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.hosts</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.hosts.exclude</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.max.tracker.blacklists</name>
@@ -352,26 +352,26 @@
<description>
if node is reported blacklisted by 16 successful jobs within timeout-window, it will be graylisted
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.healthChecker.script.path</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.healthChecker.interval</name>
<value>135000</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.healthChecker.script.timeout</name>
<value>60000</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.tracker.persist.jobstatus.active</name>
@@ -379,8 +379,8 @@
<description>Indicates if persistency of job status information is
active or not.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.tracker.persist.jobstatus.hours</name>
@@ -390,8 +390,8 @@
queue and between jobtracker restarts. With a zero value the job status
information is not persisted at all in DFS.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.tracker.persist.jobstatus.dir</name>
@@ -400,35 +400,35 @@
in a file system to be available after it drops of the memory queue and
between jobtracker restarts.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.jobtracker.retirejob.check</name>
<value>10000</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.jobtracker.retirejob.interval</name>
<value>0</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.tracker.history.completed.location</name>
<value>/mapred/history/done</value>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.task.maxvmem</name>
<value/>
<final>true</final>
<description>No description</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.jobtracker.maxtasks.per.job</name>
@@ -436,20 +436,20 @@
<final>true</final>
<description>The maximum number of tasks for a single job.
A value of -1 indicates that there is no maximum. </description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.fileoutputcommitter.marksuccessfuljobs</name>
<value>false</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.userlog.retain.hours</name>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.job.reuse.jvm.num.tasks</name>
@@ -458,8 +458,8 @@
How many tasks to run per jvm. If set to -1, there is no limit
</description>
<final>true</final>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.jobtracker.kerberos.principal</name>
@@ -467,8 +467,8 @@
<description>
JT user name key.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.tasktracker.kerberos.principal</name>
@@ -476,15 +476,15 @@
<description>
tt user name key. "_HOST" is replaced by the host name of the task tracker.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hadoop.job.history.user.location</name>
<value>none</value>
<final>true</final>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.jobtracker.keytab.file</name>
@@ -492,37 +492,37 @@
<description>
The keytab for the jobtracker principal.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.tasktracker.keytab.file</name>
<value/>
<description>The filename of the keytab for the task tracker</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.task.tracker.http.address</name>
<value/>
<description>Http address for task tracker.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.jobtracker.staging.root.dir</name>
<value>/user</value>
<description>The Path prefix for where the staging directories should be placed. The next level is always the user's
name. It is a path in the default file system.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.tasktracker.group</name>
<value>hadoop</value>
<description>The group that the task controller uses for accessing the task controller. The mapred user must be a member and users should *not* be members.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.jobtracker.split.metainfo.maxsize</name>
@@ -531,8 +531,8 @@
<description>If the size of the split metainfo file is larger than this, the JobTracker will fail the job during
initialize.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.history.server.embedded</name>
@@ -540,8 +540,8 @@
<description>Should job history server be embedded within Job tracker
process</description>
<final>true</final>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.history.server.http.address</name>
@@ -549,8 +549,8 @@ process</description>
<value/>
<description>Http address of the history server</description>
<final>true</final>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.jobhistory.kerberos.principal</name>
@@ -558,16 +558,16 @@ process</description>
<value/>
<description>Job history user name key. (must map to same user as JT
user)</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.jobhistory.keytab.file</name>
<!-- cluster variant -->
<value/>
<description>The keytab for the job history server principal.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.jobtracker.blacklist.fault-timeout-window</name>
@@ -575,8 +575,8 @@ user)</description>
<description>
3-hour sliding window (value is in minutes)
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.jobtracker.blacklist.fault-bucket-width</name>
@@ -584,14 +584,14 @@ user)</description>
<description>
15-minute bucket size (value is in minutes)
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.queue.names</name>
<value>default</value>
<description> Comma separated list of queues configured for this jobtracker.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/configuration/oozie-site.xml
index 0c705ae..ffc37d8 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/configuration/oozie-site.xml
@@ -25,8 +25,8 @@
<name>oozie.base.url</name>
<value>http://localhost:11000/oozie</value>
<description>Base Oozie URL.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.system.id</name>
@@ -34,8 +34,8 @@
<description>
The Oozie system ID.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.systemmode</name>
@@ -43,8 +43,8 @@
<description>
System mode for Oozie at startup.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.AuthorizationService.security.enabled</name>
@@ -53,8 +53,8 @@
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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.PurgeService.older.than</name>
@@ -62,8 +62,8 @@
<description>
Jobs older than this value, in days, will be purged by the PurgeService.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.PurgeService.purge.interval</name>
@@ -71,22 +71,22 @@
<description>
Interval at which the purge service will run, in seconds.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.CallableQueueService.queue.size</name>
<value>1000</value>
<description>Max callable queue size</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.CallableQueueService.threads</name>
<value>10</value>
<description>Number of threads used for executing callables</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.CallableQueueService.callable.concurrency</name>
@@ -98,16 +98,16 @@
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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.coord.normal.default.timeout</name>
<value>120</value>
<description>Default timeout for a coordinator action input check (in minutes) for normal job.
-1 means infinite timeout</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.db.schema.name</name>
@@ -115,8 +115,8 @@
<description>
Oozie DataBase Name
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.HadoopAccessorService.jobTracker.whitelist</name>
@@ -124,24 +124,24 @@
<description>
Whitelisted job tracker for Oozie service.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.authentication.type</name>
<value>simple</value>
<description>
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.HadoopAccessorService.nameNode.whitelist</name>
<value> </value>
<description>
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.WorkflowAppService.system.libpath</name>
@@ -151,8 +151,8 @@
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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>use.system.libpath.for.mapreduce.and.pig.jobs</name>
@@ -163,8 +163,8 @@
specify where the Pig JAR files are. Instead, the ones from the system
library path are used.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.authentication.kerberos.name.rules</name>
@@ -176,8 +176,8 @@
</value>
<description>The mapping from kerberos principal names to local OS user names.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.HadoopAccessorService.hadoop.configurations</name>
@@ -190,8 +190,8 @@
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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.ActionService.executor.ext.classes</name>
@@ -202,14 +202,14 @@
org.apache.oozie.action.hadoop.SqoopActionExecutor,
org.apache.oozie.action.hadoop.DistcpActionExecutor
</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.SchemaService.wf.ext.schemas</name>
<value>shell-action-0.1.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,sqoop-action-0.2.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd,hive-action-0.3.xsd</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.JPAService.create.db.schema</name>
@@ -220,8 +220,8 @@
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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.JPAService.jdbc.driver</name>
@@ -229,8 +229,8 @@
<description>
JDBC driver class.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.JPAService.jdbc.url</name>
@@ -238,8 +238,8 @@
<description>
JDBC URL.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.JPAService.jdbc.username</name>
@@ -247,8 +247,8 @@
<description>
DB user name.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.JPAService.jdbc.password</name>
@@ -259,8 +259,8 @@
IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
if empty Configuration assumes it is NULL.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.service.JPAService.pool.max.active.conn</name>
@@ -268,7 +268,7 @@
<description>
Max number of connections.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/configuration/webhcat-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/configuration/webhcat-site.xml
index 7d2f1c2..e7539a1 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/configuration/webhcat-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/configuration/webhcat-site.xml
@@ -24,92 +24,92 @@ limitations under the License.
<name>templeton.port</name>
<value>50111</value>
<description>The HTTP port for the main server.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.jar</name>
<value>/usr/lib/hcatalog/share/webhcat/svr/webhcat.jar</value>
<description>The path to the Templeton jar file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.libjars</name>
<value>/usr/lib/zookeeper/zookeeper.jar</value>
<description>Jars to add the the classpath.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.hadoop</name>
<value>/usr/bin/hadoop</value>
<description>The path to the Hadoop executable.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.pig.archive</name>
<value>hdfs:///apps/webhcat/pig.tar.gz</value>
<description>The path to the Pig archive.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.hcat</name>
<value>/usr/bin/hcat</value>
<description>The path to the hcatalog executable.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.hive.archive</name>
<value>hdfs:///apps/webhcat/hive.tar.gz</value>
<description>The path to the Hive archive.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.hive.properties</name>
<value/>
<description>Properties to set when running hive.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.zookeeper.hosts</name>
<value/>
<description>ZooKeeper servers, as comma separated host:port pairs</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.storage.class</name>
<value>org.apache.hcatalog.templeton.tool.ZooKeeperStorage</value>
<description>The class to use as storage</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.override.enabled</name>
@@ -117,21 +117,21 @@ limitations under the License.
<description>
Enable the override path in templeton.override.jars
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.streaming.jar</name>
<value>hdfs:///apps/webhcat/hadoop-streaming.jar</value>
<description>The hdfs path to the Hadoop streaming jar file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>templeton.exec.timeout</name>
<value>60000</value>
<description>Time out for templeton api</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/configuration/global.xml
index d9a2536..3eddcfc 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/configuration/global.xml
@@ -24,42 +24,42 @@
<name>ganglia_conf_dir</name>
<value>/etc/ganglia/hdp</value>
<description>Config directory for Ganglia</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ganglia_runtime_dir</name>
<value>/var/run/ganglia/hdp</value>
<description>Run directories for Ganglia</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ganglia_runtime_dir</name>
<value>/var/run/ganglia/hdp</value>
<description>Run directories for Ganglia</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>gmetad_user</name>
<value>nobody</value>
<description>User </description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>gmond_user</name>
<value>nobody</value>
<description>User </description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
index 5edac2e..ecfe4ba 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/global.xml
@@ -24,43 +24,43 @@
<name>hbasemaster_host</name>
<value/>
<description>HBase Master Host.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>regionserver_hosts</name>
<value/>
<description>Region Server Hosts</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_log_dir</name>
<value>/var/log/hbase</value>
<description>Log Directories for HBase.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_pid_dir</name>
<value>/var/run/hbase</value>
<description>Log Directories for HBase.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_log_dir</name>
<value>/var/log/hbase</value>
<description>Log Directories for HBase.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_regionserver_heapsize</name>
<value>1024</value>
<description>RegionServer heap size.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_regionserver_xmn_max</name>
@@ -70,168 +70,168 @@ 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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
<value>0.2</value>
<description>Percentage of max heap size which used for young generation heap (-Xmx).</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_master_heapsize</name>
<value>1024</value>
<description>HBase Master Heap Size</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hstore_compactionthreshold</name>
<value>3</value>
<description>HBase HStore compaction threshold.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hfile_blockcache_size</name>
<value>0.25</value>
<description>HFile block cache size.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hstorefile_maxsize</name>
<value>1073741824</value>
<description>Maximum HStoreFile Size</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>regionserver_handlers</name>
<value>30</value>
<description>HBase RegionServer Handler</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hregion_majorcompaction</name>
<value>86400000</value>
<description>HBase Major Compaction.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hregion_blockmultiplier</name>
<value>2</value>
<description>HBase Region Block Multiplier</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hregion_memstoreflushsize</name>
<value/>
<description>HBase Region MemStore Flush Size.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>client_scannercaching</name>
<value>100</value>
<description>Base Client Scanner Caching</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zookeeper_sessiontimeout</name>
<value>60000</value>
<description>ZooKeeper Session Timeout</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hfile_max_keyvalue_size</name>
<value>10485760</value>
<description>HBase Client Maximum key-value Size</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_hdfs_root_dir</name>
<value>/apps/hbase/data</value>
<description>HBase Relative Path to HDFS.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_tmp_dir</name>
<value>/var/log/hbase</value>
<description>Hbase temp directory</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_conf_dir</name>
<value>/etc/hbase</value>
<description>Config Directory for HBase.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hdfs_enable_shortcircuit_read</name>
<value>true</value>
<description>HDFS Short Circuit Read</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hdfs_support_append</name>
<value>true</value>
<description>HDFS append support</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hstore_blockingstorefiles</name>
<value>7</value>
<description>HStore blocking storefiles.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>regionserver_memstore_lab</name>
<value>true</value>
<description>Region Server memstore.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>regionserver_memstore_lowerlimit</name>
<value>0.35</value>
<description>Region Server memstore lower limit.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>regionserver_memstore_upperlimit</name>
<value>0.4</value>
<description>Region Server memstore upper limit.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_conf_dir</name>
<value>/etc/hbase</value>
<description>HBase conf dir.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hbase_user</name>
<value>hbase</value>
<description>HBase User Name.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/hbase-policy.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/hbase-policy.xml
index c938e26..ecfbfe3 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/hbase-policy.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/configuration/hbase-policy.xml
@@ -28,8 +28,8 @@
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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>security.admin.protocol.acl</name>
@@ -39,8 +39,8 @@
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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>security.masterregion.protocol.acl</name>
@@ -50,7 +50,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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>