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/01 15:25:52 UTC
[09/94] ambari git commit: AMBARI-16272. Ambari Upgrade shouldn't
automatically add stack configs (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/capacity-scheduler.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
index 8034d19..5b270c2 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,30 +15,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- This is the configuration file for the resource manager in Hadoop. -->
<!-- You can configure various scheduling parameters related to queues. -->
<!-- The properties for a queue follow a naming convention,such as, -->
<!-- mapred.capacity-scheduler.queue.<queue-name>.property-name. -->
-
<configuration>
-
<property>
<name>mapred.capacity-scheduler.maximum-system-jobs</name>
<value>3000</value>
<description>Maximum number of jobs in the system which can be initialized,
concurrently, by the CapacityScheduler.
- </description>
+ </description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.queue.default.capacity</name>
<value>100</value>
<description>Percentage of the number of slots in the cluster that are
to be available for jobs in this queue.
- </description>
+ </description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.queue.default.maximum-capacity</name>
<value>-1</value>
@@ -56,17 +54,19 @@
One important thing to note is that maximum-capacity is a percentage , so based on the cluster's capacity
the max capacity would change. So if large no of nodes or racks get added to the cluster , max Capacity in
absolute terms would increase accordingly.
- </description>
+ </description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.queue.default.supports-priority</name>
<value>false</value>
<description>If true, priorities of jobs will be taken into
account in scheduling decisions.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.queue.default.minimum-user-limit-percent</name>
<value>100</value>
@@ -81,16 +81,18 @@
or more users, no user can use more than 25% of the queue's resources. A
value of 100 implies no user limits are imposed.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.queue.default.user-limit-factor</name>
<value>1</value>
<description>The multiple of the queue capacity which can be configured to
allow a single user to acquire more slots.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.queue.default.maximum-initialized-active-tasks</name>
<value>200000</value>
@@ -98,8 +100,9 @@
which can be initialized concurrently. Once the queue's jobs exceed this
limit they will be queued on disk.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.queue.default.maximum-initialized-active-tasks-per-user</name>
<value>100000</value>
@@ -107,16 +110,18 @@
user's jobs in the queue, which can be initialized concurrently. Once the
user's jobs exceed this limit they will be queued on disk.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.queue.default.init-accept-jobs-factor</name>
<value>10</value>
<description>The multipe of (maximum-system-jobs * queue-capacity) used to
determine the number of jobs which are accepted by the scheduler.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- The default configuration settings for the capacity task scheduler -->
<!-- The default values would be applied to all the queues which don't have -->
<!-- the appropriate property for the particular queue -->
@@ -126,25 +131,27 @@
<description>If true, priorities of jobs will be taken into
account in scheduling decisions by default in a job queue.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.default-minimum-user-limit-percent</name>
<value>100</value>
<description>The percentage of the resources limited to a particular user
for the job queue at any given point of time by default.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-
<property>
<name>mapred.capacity-scheduler.default-user-limit-factor</name>
<value>1</value>
<description>The default multiple of queue-capacity which is used to
determine the amount of slots a single user can consume concurrently.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.default-maximum-active-tasks-per-queue</name>
<value>200000</value>
@@ -152,8 +159,9 @@
queue, which can be initialized concurrently. Once the queue's jobs exceed
this limit they will be queued on disk.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.default-maximum-active-tasks-per-user</name>
<value>100000</value>
@@ -161,16 +169,18 @@
the user's jobs in the queue, which can be initialized concurrently. Once
the user's jobs exceed this limit they will be queued on disk.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.capacity-scheduler.default-init-accept-jobs-factor</name>
<value>10</value>
<description>The default multipe of (maximum-system-jobs * queue-capacity)
used to determine the number of jobs which are accepted by the scheduler.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- Capacity scheduler Job Initialization configuration parameters -->
<property>
<name>mapred.capacity-scheduler.init-poll-interval</name>
@@ -178,6 +188,8 @@
<description>The amount of time in miliseconds which is used to poll
the job queues for jobs to initialize.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred.capacity-scheduler.init-worker-threads</name>
@@ -190,6 +202,7 @@
is greater then number of threads would be equal to number of
job queues.
</description>
+ <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/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/global.xml
index d279724..2dedf50 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/global.xml
@@ -19,142 +19,194 @@
* limitations under the License.
*/
-->
-
<configuration>
<property>
<name>jobtracker_host</name>
- <value></value>
+ <value/>
<description>JobTracker Host.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>tasktracker_hosts</name>
- <value></value>
+ <value/>
<description>TaskTracker hosts.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_local_dir</name>
<value>/hadoop/mapred</value>
<description>MapRed Local Directories.</description>
+ <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>MapRed System Directories.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>scheduler_name</name>
<value>org.apache.hadoop.mapred.CapacityTaskScheduler</value>
<description>MapRed Capacity Scheduler.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>jtnode_opt_newsize</name>
<value>200</value>
<description>Mem New Size.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>jtnode_opt_maxnewsize</name>
<value>200</value>
<description>Max New size.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hadoop_heapsize</name>
<value>1024</value>
<description>Hadoop maximum Java heap size</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>jtnode_heapsize</name>
<value>1024</value>
<description>Maximum Java heap size for JobTracker in MB (Java option -Xmx)</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_map_tasks_max</name>
<value>4</value>
<description>Number of slots that Map tasks that run simultaneously can occupy on a TaskTracker</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_red_tasks_max</name>
<value>2</value>
<description>Number of slots that Reduce tasks that run simultaneously can occupy on a TaskTracker</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_cluster_map_mem_mb</name>
<value>-1</value>
<description>The virtual memory size of a single Map slot in the MapReduce framework</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_cluster_red_mem_mb</name>
<value>-1</value>
<description>The virtual memory size of a single Reduce slot in the MapReduce framework</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_job_map_mem_mb</name>
<value>-1</value>
<description>Virtual memory for single Map task</description>
+ <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_sz</name>
<value>768</value>
<description>Java options for the TaskTracker child processes.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>io_sort_mb</name>
<value>200</value>
<description>The total amount of Map-side buffer memory to use while sorting files (Expert-only configuration).</description>
+ <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>0.9</value>
<description>Percentage of sort buffer used for record collection (Expert-only configuration.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce_userlog_retainhours</name>
<value>24</value>
<description>The maximum time, in hours, for which the user-logs are to be retained after the job completion.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>maxtasks_per_job</name>
<value>-1</value>
<description>Maximum number of tasks for a single Job</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>lzo_enabled</name>
<value>false</value>
<description>LZO compression enabled</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>snappy_enabled</name>
<value>true</value>
<description>LZO compression enabled</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>rca_enabled</name>
<value>true</value>
<description>Enable Job Diagnostics.</description>
+ <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></value>
+ <value/>
<description>Exclude entered hosts</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_hosts_include</name>
- <value></value>
+ <value/>
<description>Include entered hosts</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_jobstatus_dir</name>
<value>file:////mapred/jobstatus</value>
<description>Job Status directory</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>task_controller</name>
<value>org.apache.hadoop.mapred.DefaultTaskController</value>
<description>Task Controller.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapred_user</name>
<value>mapred</value>
<description>MapReduce User.</description>
+ <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/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml
index ce12380..2b6307e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-queue-acls.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,23 +16,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- mapred-queue-acls.xml -->
<configuration>
-
-
-<!-- queue default -->
-
+ <!-- queue default -->
<property>
<name>mapred.queue.default.acl-submit-job</name>
<value>*</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.queue.default.acl-administer-jobs</name>
<value>*</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- END ACLs -->
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
index 2c5630f..eff9bdf 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,50 +16,50 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
<configuration xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<!-- i/o properties -->
-
+ <!-- i/o properties -->
<property>
<name>io.sort.mb</name>
- <value></value>
+ <value/>
<description>No description</description>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>io.sort.spill.percent</name>
- <value></value>
+ <value/>
<description>No description</description>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-<!-- map/reduce properties -->
-
-<property>
- <name>mapred.tasktracker.tasks.sleeptime-before-sigkill</name>
- <value>250</value>
- <description>Normally, this is the amount of time before killing
+ <!-- map/reduce properties -->
+ <property>
+ <name>mapred.tasktracker.tasks.sleeptime-before-sigkill</name>
+ <value>250</value>
+ <description>Normally, this is the amount of time before killing
processes, and the recommended-default is 5.000 seconds - a value of
5000 here. In this case, we are using it solely to blast tasks before
killing them, and killing them very quickly (1/4 second) to guarantee
that we do not leave VMs around for later jobs.
</description>
-</property>
-
+ <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>
<value>50</value>
@@ -68,86 +67,99 @@
The number of server threads for the JobTracker. This should be roughly
4% of the number of tasktracker nodes.
</description>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.job.tracker</name>
<!-- cluster variant -->
- <value></value>
+ <value/>
<description>No description</description>
<final>true</final>
+ <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>
<!-- cluster variant -->
- <value></value>
+ <value/>
<description>No description</description>
<final>true</final>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<!-- cluster specific -->
<name>mapred.local.dir</name>
- <value></value>
+ <value/>
<description>No description</description>
<final>true</final>
+ <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>
+ <name>mapreduce.cluster.administrators</name>
+ <value> hadoop</value>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.tasktracker.map.tasks.maximum</name>
- <value></value>
+ <value/>
<description>No description</description>
+ <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></value>
+ <value/>
<description>No description</description>
+ <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="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="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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.inmem.merge.threshold</name>
<value>1000</value>
@@ -157,8 +169,9 @@
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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.job.shuffle.merge.percent</name>
<value>0.66</value>
@@ -167,51 +180,57 @@
storing in-memory map outputs, as defined by
mapred.job.shuffle.input.buffer.percent.
</description>
+ <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>
<value>0.7</value>
<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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.map.output.compression.codec</name>
<value>org.apache.hadoop.io.compress.SnappyCodec</value>
<description>If the map outputs are compressed, how should they be
compressed
</description>
+ <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>
- <value>BLOCK</value>
- <description>If the job outputs are to compressed as SequenceFiles, how should
+ <property>
+ <name>mapred.output.compression.type</name>
+ <value>BLOCK</value>
+ <description>If the job outputs are to compressed as SequenceFiles, how should
they be compressed? Should be one of NONE, RECORD or BLOCK.
</description>
-</property>
-
-
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.jobtracker.taskScheduler</name>
- <value></value>
+ <value/>
+ <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>
<value>false</value>
<description>"true" to enable (job) recovery upon restart,
"false" to start afresh
</description>
+ <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>
<value>0.0</value>
@@ -220,25 +239,26 @@
remaining map outputs in memory must consume less than this threshold before
the reduce can begin.
</description>
+ <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>
- <value>10737418240</value>
- <description>The limit on the input size of the reduce. (This value
+ <property>
+ <name>mapreduce.reduce.input.limit</name>
+ <value>10737418240</value>
+ <description>The limit on the input size of the reduce. (This value
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>
-</property>
-
-
+ <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></value>
+ <value/>
+ <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>
<value>600000</value>
@@ -246,240 +266,273 @@
terminated if it neither reads an input, writes an output, nor
updates its status string.
</description>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.task.tracker.task-controller</name>
- <value></value>
- <description>
+ <value/>
+ <description>
TaskController which is used to launch and manage task execution.
</description>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapred.child.java.opts</name>
- <value></value>
-
+ <value/>
<description>No description</description>
+ <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></value>
+ <value/>
+ <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></value>
+ <value/>
+ <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></value>
+ <value/>
+ <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></value>
+ <value/>
+ <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></value>
+ <value/>
+ <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></value>
+ <value/>
+ <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></value>
-</property>
-
-<property>
- <name>mapred.hosts.exclude</name>
- <value></value>
-</property>
-
-<property>
- <name>mapred.max.tracker.blacklists</name>
- <value>16</value>
- <description>
+ <property>
+ <name>mapred.hosts</name>
+ <value/>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>mapred.max.tracker.blacklists</name>
+ <value>16</value>
+ <description>
if node is reported blacklisted by 16 successful jobs within timeout-window, it will be graylisted
</description>
-</property>
-
-<property>
- <name>mapred.healthChecker.script.path</name>
- <value></value>
-</property>
-
-<property>
- <name>mapred.healthChecker.interval</name>
- <value>135000</value>
-</property>
-
-<property>
- <name>mapred.healthChecker.script.timeout</name>
- <value>60000</value>
-</property>
-
-<property>
- <name>mapred.job.tracker.persist.jobstatus.active</name>
- <value>false</value>
- <description>Indicates if persistency of job status information is
+ <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="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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>mapred.job.tracker.persist.jobstatus.active</name>
+ <value>false</value>
+ <description>Indicates if persistency of job status information is
active or not.
</description>
-</property>
-
-<property>
- <name>mapred.job.tracker.persist.jobstatus.hours</name>
- <value>1</value>
- <description>The number of hours job status information is persisted in DFS.
+ <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>
+ <value>1</value>
+ <description>The number of hours job status information is persisted in DFS.
The job status information will be available after it drops of the memory
queue and between jobtracker restarts. With a zero value the job status
information is not persisted at all in DFS.
</description>
-</property>
-
-<property>
- <name>mapred.job.tracker.persist.jobstatus.dir</name>
- <value></value>
- <description>The directory where the job status information is persisted
+ <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>
+ <value/>
+ <description>The directory where the job status information is persisted
in a file system to be available after it drops of the memory queue and
between jobtracker restarts.
</description>
-</property>
-
-<property>
- <name>mapred.jobtracker.retirejob.check</name>
- <value>10000</value>
-</property>
-
-<property>
- <name>mapred.jobtracker.retirejob.interval</name>
- <value>21600000</value>
-</property>
-
-<property>
- <name>mapred.job.tracker.history.completed.location</name>
- <value>/mapred/history/done</value>
- <description>No description</description>
-</property>
-
-<property>
- <name>mapred.task.maxvmem</name>
- <value></value>
- <final>true</final>
- <description>No description</description>
-</property>
-
-<property>
- <name>mapred.jobtracker.maxtasks.per.job</name>
- <value></value>
- <final>true</final>
- <description>The maximum number of tasks for a single job.
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>mapred.jobtracker.retirejob.interval</name>
+ <value>21600000</value>
+ <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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>mapred.jobtracker.maxtasks.per.job</name>
+ <value/>
+ <final>true</final>
+ <description>The maximum number of tasks for a single job.
A value of -1 indicates that there is no maximum. </description>
-</property>
-
-<property>
- <name>mapreduce.fileoutputcommitter.marksuccessfuljobs</name>
- <value>false</value>
-</property>
-
-<property>
- <name>mapred.userlog.retain.hours</name>
- <value></value>
-</property>
-
-<property>
- <name>mapred.job.reuse.jvm.num.tasks</name>
- <value>1</value>
- <description>
+ <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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>mapred.job.reuse.jvm.num.tasks</name>
+ <value>1</value>
+ <description>
How many tasks to run per jvm. If set to -1, there is no limit
</description>
- <final>true</final>
-</property>
-
-<property>
- <name>mapreduce.jobtracker.kerberos.principal</name>
- <value></value>
- <description>
+ <final>true</final>
+ <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>
+ <value/>
+ <description>
JT user name key.
</description>
-</property>
-
-<property>
- <name>mapreduce.tasktracker.kerberos.principal</name>
- <value></value>
- <description>
+ <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>
+ <value/>
+ <description>
tt user name key. "_HOST" is replaced by the host name of the task tracker.
</description>
-</property>
-
-
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-
- <property>
- <name>mapreduce.jobtracker.keytab.file</name>
- <value></value>
- <description>
+ <property>
+ <name>mapreduce.jobtracker.keytab.file</name>
+ <value/>
+ <description>
The keytab for the jobtracker principal.
</description>
-
-</property>
-
- <property>
- <name>mapreduce.tasktracker.keytab.file</name>
- <value></value>
+ <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>
- </property>
-
- <property>
- <name>mapred.task.tracker.http.address</name>
- <value></value>
- <description>Http address for task tracker.</description>
- </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
+ <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="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>
- </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>
-
- </property>
-
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
<property>
<name>mapreduce.jobtracker.split.metainfo.maxsize</name>
<value>50000000</value>
<final>true</final>
- <description>If the size of the split metainfo file is larger than this, the JobTracker will fail the job during
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>mapreduce.history.server.embedded</name>
@@ -487,51 +540,58 @@
<description>Should job history server be embedded within Job tracker
process</description>
<final>true</final>
+ <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>
<!-- cluster variant -->
- <value></value>
+ <value/>
<description>Http address of the history server</description>
<final>true</final>
+ <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>
<!-- cluster variant -->
- <value></value>
+ <value/>
<description>Job history user name key. (must map to same user as JT
user)</description>
+ <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>
+ <property>
+ <name>mapreduce.jobhistory.keytab.file</name>
<!-- cluster variant -->
- <value></value>
- <description>The keytab for the job history server principal.</description>
- </property>
-
-<property>
- <name>mapred.jobtracker.blacklist.fault-timeout-window</name>
- <value>180</value>
- <description>
+ <value/>
+ <description>The keytab for the job history server principal.</description>
+ <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>
+ <value>180</value>
+ <description>
3-hour sliding window (value is in minutes)
</description>
-</property>
-
-<property>
- <name>mapred.jobtracker.blacklist.fault-bucket-width</name>
- <value>15</value>
- <description>
+ <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>
+ <value>15</value>
+ <description>
15-minute bucket size (value is in minutes)
</description>
-</property>
-
-<property>
- <name>mapred.queue.names</name>
- <value>default</value>
- <description> Comma separated list of queues configured for this jobtracker.</description>
-</property>
-
+ <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="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/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/global.xml
index ddbf780..2f08b1e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/global.xml
@@ -19,87 +19,117 @@
* limitations under the License.
*/
-->
-
<configuration>
<property>
<name>oozie_user</name>
<value>oozie</value>
<description>Oozie User.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozieserver_host</name>
- <value></value>
+ <value/>
<description>Oozie Server Host.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_database</name>
- <value></value>
+ <value/>
<description>Oozie Server Database.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_derby_database</name>
<value>Derby</value>
<description>Oozie Derby Database.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_existing_mysql_database</name>
<value>MySQL</value>
<description>Oozie MySQL Database.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_existing_mysql_host</name>
- <value></value>
+ <value/>
<description>Existing MySQL Host.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_existing_oracle_database</name>
<value>Oracle</value>
<description>Oracle Database</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_existing_oracle_host</name>
- <value></value>
+ <value/>
<description>Database Host.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_ambari_database</name>
<value>MySQL</value>
<description>Database default.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_ambari_host</name>
- <value></value>
+ <value/>
<description>Host on which databse will be created.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_database_name</name>
<value>oozie</value>
<description>Database name used for the Oozie.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_metastore_user_name</name>
<value>oozie</value>
<description>Database user name to use to connect to the database</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_metastore_user_passwd</name>
- <value></value>
+ <value/>
<description>Database password to use to connect to the database</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_data_dir</name>
<value>/hadoop/oozie/data</value>
<description>Data directory in which the Oozie DB exists</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_log_dir</name>
<value>/var/log/oozie</value>
<description>Directory for oozie logs</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie_pid_dir</name>
<value>/var/run/oozie</value>
<description>Directory in which the pid files for oozie reside.</description>
+ <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/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/oozie-site.xml
index cb1317a..464e3f5 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/configuration/oozie-site.xml
@@ -15,11 +15,9 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-
+-->
<configuration>
-
-<!--
+ <!--
Refer to the oozie-default.xml file for the complete list of
Oozie configuration properties and their default values.
-->
@@ -27,145 +25,164 @@
<name>oozie.base.url</name>
<value>http://localhost:11000/oozie</value>
<description>Base Oozie URL.</description>
- </property>
-
+ <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>
<value>oozie-${user.name}</value>
<description>
The Oozie system ID.
</description>
- </property>
-
- <property>
- <name>oozie.systemmode</name>
- <value>NORMAL</value>
- <description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>oozie.systemmode</name>
+ <value>NORMAL</value>
+ <description>
System mode for Oozie at startup.
</description>
- </property>
-
- <property>
- <name>oozie.service.AuthorizationService.authorization.enabled</name>
- <value>true</value>
- <description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>oozie.service.AuthorizationService.authorization.enabled</name>
+ <value>true</value>
+ <description>
Specifies whether security (user name/admin role) is enabled or not.
If disabled any user can manage Oozie system and manage any job.
</description>
- </property>
-
- <property>
- <name>oozie.service.PurgeService.older.than</name>
- <value>30</value>
- <description>
+ <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>
+ <value>30</value>
+ <description>
Jobs older than this value, in days, will be purged by the PurgeService.
</description>
- </property>
-
- <property>
- <name>oozie.service.PurgeService.purge.interval</name>
- <value>3600</value>
- <description>
+ <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>
+ <value>3600</value>
+ <description>
Interval at which the purge service will run, in seconds.
</description>
- </property>
-
- <property>
- <name>oozie.service.CallableQueueService.queue.size</name>
- <value>1000</value>
- <description>Max callable queue size</description>
- </property>
-
- <property>
- <name>oozie.service.CallableQueueService.threads</name>
- <value>10</value>
- <description>Number of threads used for executing callables</description>
- </property>
-
- <property>
- <name>oozie.service.CallableQueueService.callable.concurrency</name>
- <value>3</value>
- <description>
+ <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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>oozie.service.CallableQueueService.callable.concurrency</name>
+ <value>3</value>
+ <description>
Maximum concurrency for a given callable type.
Each command is a callable type (submit, start, run, signal, job, jobs, suspend,resume, etc).
Each action type is a callable type (Map-Reduce, Pig, SSH, FS, sub-workflow, etc).
All commands that use action executors (action-start, action-end, action-kill and action-check) use
the action type as the callable type.
</description>
- </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.
+ <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>
- </property>
-
- <property>
- <name>oozie.db.schema.name</name>
- <value>oozie</value>
- <description>
+ <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>
+ <value>oozie</value>
+ <description>
Oozie DataBase Name
</description>
- </property>
-
- <property>
- <name>oozie.service.HadoopAccessorService.jobTracker.whitelist</name>
- <value> </value>
- <description>
+ <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>
+ <value> </value>
+ <description>
Whitelisted job tracker for Oozie service.
</description>
- </property>
-
- <property>
- <name>oozie.authentication.type</name>
- <value>simple</value>
- <description>
+ <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>
- </property>
-
- <property>
- <name>oozie.service.HadoopAccessorService.nameNode.whitelist</name>
- <value> </value>
- <description>
+ <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>
- </property>
-
- <property>
- <name>oozie.service.WorkflowAppService.system.libpath</name>
- <value>/user/${user.name}/share/lib</value>
- <description>
+ <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>
+ <value>/user/${user.name}/share/lib</value>
+ <description>
System library path to use for workflow applications.
This path is added to workflow application if their job properties sets
the property 'oozie.use.system.libpath' to true.
</description>
- </property>
-
- <property>
- <name>use.system.libpath.for.mapreduce.and.pig.jobs</name>
- <value>false</value>
- <description>
+ <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>
+ <value>false</value>
+ <description>
If set to true, submissions of MapReduce and Pig jobs will include
automatically the system library path, thus not requiring users to
specify where the Pig JAR files are. Instead, the ones from the system
library path are used.
</description>
- </property>
- <property>
- <name>oozie.authentication.kerberos.name.rules</name>
- <value>
+ <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>
+ <value>
</value>
- <description>The mapping from kerberos principal names to local OS user names.</description>
- </property>
- <property>
- <name>oozie.service.HadoopAccessorService.hadoop.configurations</name>
- <value>*=/etc/hadoop/conf</value>
- <description>
+ <description>The mapping from kerberos principal names to local OS user names.</description>
+ <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>
+ <value>*=/etc/hadoop/conf</value>
+ <description>
Comma separated AUTHORITY=HADOOP_CONF_DIR, where AUTHORITY is the HOST:PORT of
the Hadoop service (JobTracker, HDFS). The wildcard '*' configuration is
used when there is no exact match for an authority. The HADOOP_CONF_DIR contains
@@ -173,73 +190,85 @@
the Oozie configuration directory; though the path can be absolute (i.e. to point
to Hadoop client conf/ directories in the local filesystem.
</description>
- </property>
- <property>
- <name>oozie.service.ActionService.executor.ext.classes</name>
- <value>
+ <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>
+ <value>
org.apache.oozie.action.email.EmailActionExecutor,
org.apache.oozie.action.hadoop.HiveActionExecutor,
org.apache.oozie.action.hadoop.ShellActionExecutor,
org.apache.oozie.action.hadoop.SqoopActionExecutor,
org.apache.oozie.action.hadoop.DistcpActionExecutor
</value>
- </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>
- </property>
- <property>
- <name>oozie.service.JPAService.create.db.schema</name>
- <value>false</value>
- <description>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
+ <property>
+ <name>oozie.service.JPAService.create.db.schema</name>
+ <value>false</value>
+ <description>
Creates Oozie DB.
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>
- </property>
-
- <property>
- <name>oozie.service.JPAService.jdbc.driver</name>
- <value>org.apache.derby.jdbc.EmbeddedDriver</value>
- <description>
+ <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>
+ <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+ <description>
JDBC driver class.
</description>
- </property>
-
- <property>
- <name>oozie.service.JPAService.jdbc.url</name>
- <value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
- <description>
+ <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>
+ <value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
+ <description>
JDBC URL.
</description>
- </property>
-
- <property>
- <name>oozie.service.JPAService.jdbc.username</name>
- <value>sa</value>
- <description>
+ <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>
+ <value>sa</value>
+ <description>
DB user name.
</description>
- </property>
-
- <property>
- <name>oozie.service.JPAService.jdbc.password</name>
- <value> </value>
- <description>
+ <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>
+ <value> </value>
+ <description>
DB user password.
IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
if empty Configuration assumes it is NULL.
</description>
- </property>
-
- <property>
- <name>oozie.service.JPAService.pool.max.active.conn</name>
- <value>10</value>
- <description>
+ <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>
+ <value>10</value>
+ <description>
Max number of connections.
</description>
- </property>
+ <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/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/configuration/webhcat-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/configuration/webhcat-site.xml
index 31d0113..e7539a1 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/configuration/webhcat-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/configuration/webhcat-site.xml
@@ -16,111 +16,122 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- The default settings for Templeton. -->
<!-- Edit templeton-site.xml to change settings for your local -->
<!-- install. -->
-
<configuration>
-
<property>
<name>templeton.port</name>
- <value>50111</value>
+ <value>50111</value>
<description>The HTTP port for the main server.</description>
+ <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="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="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="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="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="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="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="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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hive.properties</name>
- <value></value>
+ <value/>
<description>Properties to set when running hive.</description>
+ <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></value>
+ <value/>
<description>ZooKeeper servers, as comma separated host:port pairs</description>
+ <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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
- <name>templeton.override.enabled</name>
- <value>false</value>
- <description>
+ <name>templeton.override.enabled</name>
+ <value>false</value>
+ <description>
Enable the override path in templeton.override.jars
</description>
- </property>
-
- <property>
+ <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>
- </property>
-
+ <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="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/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/configuration/global.xml
index f78df89..87c17b7 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/configuration/global.xml
@@ -19,57 +19,75 @@
* limitations under the License.
*/
-->
-
<configuration>
<property>
<name>zk_user</name>
<value>zookeeper</value>
<description>ZooKeeper User.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zookeeperserver_host</name>
- <value></value>
+ <value/>
<description>ZooKeeper Server Hosts.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zk_data_dir</name>
<value>/hadoop/zookeeper</value>
<description>Data directory for ZooKeeper.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zk_log_dir</name>
<value>/var/log/zookeeper</value>
<description>ZooKeeper Log Dir</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zk_pid_dir</name>
<value>/var/run/zookeeper</value>
<description>ZooKeeper Pid Dir</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>zk_pid_file</name>
<value>/var/run/zookeeper/zookeeper_server.pid</value>
<description>ZooKeeper Pid File</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>tickTime</name>
<value>2000</value>
<description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>initLimit</name>
<value>10</value>
<description>Ticks to allow for sync at Init.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>syncLimit</name>
<value>5</value>
<description>Ticks to allow for sync at Runtime.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>clientPort</name>
<value>2181</value>
<description>Port for running ZK Server.</description>
+ <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/6f855d53/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/configuration/hbase-policy.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/configuration/hbase-policy.xml
index e45f23c..ecfbfe3 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/configuration/hbase-policy.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/configuration/hbase-policy.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration>
<property>
<name>security.client.protocol.acl</name>
@@ -29,8 +28,9 @@
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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>security.admin.protocol.acl</name>
<value>*</value>
@@ -39,8 +39,9 @@
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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>security.masterregion.protocol.acl</name>
<value>*</value>
@@ -49,5 +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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>