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 01:59:44 UTC
[37/98] [abbrv] [partial] ambari git commit: Revert "AMBARI-16272.
Ambari Upgrade shouldn't automatically add stack configs. Fix default upgrade
policy (dlysnichenko)" - failed testcases.
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml
index f8aeceb..94270dc 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/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,8 +98,8 @@
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>
@@ -107,8 +107,8 @@
<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>
@@ -119,8 +119,8 @@
<value-attributes>
<type>database</type>
</value-attributes>
- <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>
@@ -129,8 +129,8 @@
Authentication used for Oozie HTTP endpoint, the supported values are: simple | kerberos |
#AUTHENTICATION_HANDLER_CLASSNAME#.
</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>
@@ -140,8 +140,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>
@@ -152,8 +152,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>
@@ -165,8 +165,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>
@@ -179,8 +179,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>
@@ -196,8 +196,8 @@
be used in workflows. This property is a convenience property to add extensions to the built in executors without
having to include all the built in ones.
</description>
- <on-ambari-upgrade add="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>
@@ -206,8 +206,8 @@
Schemas for additional actions types. IMPORTANT: if there are no schemas leave a 1 space string, the service
trims the value, if empty Configuration assumes it is NULL.
</description>
- <on-ambari-upgrade add="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>
@@ -218,8 +218,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>
@@ -227,8 +227,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>
@@ -236,8 +236,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>
@@ -245,8 +245,8 @@
<description>
Database user name to use to connect to the database
</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 require-input="true">
<name>oozie.service.JPAService.jdbc.password</name>
@@ -261,8 +261,8 @@
<value-attributes>
<type>password</type>
</value-attributes>
- <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>
@@ -270,8 +270,8 @@
<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>
<property>
<name>oozie.services</name>
@@ -309,8 +309,8 @@
org.apache.oozie.service.ProxyUserService
</value>
<description>List of Oozie services</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.URIHandlerService.uri.handlers</name>
@@ -318,8 +318,8 @@
<description>
Enlist the different uri handlers supported for data availability checks.
</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.services.ext</name>
@@ -329,8 +329,8 @@
To add/replace services defined in 'oozie.services' with custom implementations.
Class names must be separated by commas.
</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.push.check.requeue.interval</name>
@@ -338,8 +338,8 @@
<description>
Command re-queue interval for push dependencies (in millisecond).
</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.credentials.credentialclasses</name>
@@ -347,7 +347,7 @@
<description>
Credential Class to be used for HCat.
</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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml
index f883b4d..654dffe 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml
@@ -35,7 +35,7 @@ fi
<value-attributes>
<type>content</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml
index 5715e2a..904eed6 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml
@@ -58,7 +58,7 @@ log4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
<value-attributes>
<type>content</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml
index 0070078..b13f688 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml
@@ -88,7 +88,7 @@ hcat.bin=/usr/bin/hcat
<value-attributes>
<type>content</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
index f90b3ae..6ccafba 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
@@ -24,15 +24,15 @@
<name>mapred_log_dir_prefix</name>
<value>/var/log/hadoop-mapreduce</value>
<description>Mapreduce Log Dir Prefix</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_pid_dir_prefix</name>
<value>/var/run/hadoop-mapreduce</value>
<description>Mapreduce PID Dir Prefix</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_user</name>
@@ -44,15 +44,15 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <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>jobhistory_heapsize</name>
<value>900</value>
<description>Value for JobHistoryServer heap_size variable in hadoop-env.sh</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>
<!-- mapred-env.sh -->
<property>
@@ -75,7 +75,7 @@ export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA
<value-attributes>
<type>content</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-site.xml
index 2655e51..532e2af 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-site.xml
@@ -26,8 +26,8 @@
The total amount of buffer memory to use while sorting files, in megabytes.
By default, gives each merge stream 1MB, which should minimize seeks.
</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.map.sort.spill.percent</name>
@@ -39,8 +39,8 @@
is already in progress, so spills may be larger than this threshold when
it is set to less than .5
</description>
- <on-ambari-upgrade add="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.task.io.sort.factor</name>
@@ -49,8 +49,8 @@
The number of streams to merge at once while sorting files.
This determines the number of open file handles.
</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>
@@ -59,8 +59,8 @@
<description>
Administrators for MapReduce applications.
</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.shuffle.parallelcopies</name>
@@ -69,8 +69,8 @@
The default number of parallel transfers run by reduce during
the copy(shuffle) phase.
</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.map.speculative</name>
@@ -79,8 +79,8 @@
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>mapreduce.reduce.speculative</name>
@@ -89,8 +89,8 @@
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>mapreduce.job.reduce.slowstart.completedmaps</name>
@@ -99,8 +99,8 @@
Fraction of the number of maps in the job which should be complete before
reduces are scheduled for the job.
</description>
- <on-ambari-upgrade add="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.shuffle.merge.percent</name>
@@ -111,8 +111,8 @@
storing in-memory map outputs, as defined by
mapreduce.reduce.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>mapreduce.reduce.shuffle.input.buffer.percent</name>
@@ -121,8 +121,8 @@
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>mapreduce.output.fileoutputformat.compress.type</name>
@@ -131,8 +131,8 @@
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>mapreduce.reduce.input.buffer.percent</name>
@@ -143,8 +143,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>
<!-- copied from kryptonite configuration -->
<property>
@@ -153,8 +153,8 @@
<description>
Should the outputs of the maps be compressed before being sent across the network. Uses SequenceFile compression.
</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.task.timeout</name>
@@ -164,22 +164,22 @@
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>mapreduce.map.memory.mb</name>
<value>1024</value>
<description>Virtual memory for single Map task</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.memory.mb</name>
<value>1024</value>
<description>Virtual memory for single Reduce task</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.shuffle.port</name>
@@ -189,8 +189,8 @@
ShuffleHandler is a service run at the NodeManager to facilitate
transfers of intermediate Map outputs to requesting Reducers.
</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.intermediate-done-dir</name>
@@ -198,8 +198,8 @@
<description>
Directory where history files are written by MapReduce 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>mapreduce.jobhistory.done-dir</name>
@@ -207,22 +207,22 @@
<description>
Directory where history files are managed by the MR JobHistory 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>mapreduce.jobhistory.address</name>
<value>localhost:10020</value>
<description>Enter your JobHistoryServer hostname.</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.webapp.address</name>
<value>localhost:19888</value>
<description>Enter your JobHistoryServer hostname.</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.framework.name</name>
@@ -231,8 +231,8 @@
The runtime framework for executing MapReduce jobs. Can be one of local,
classic or yarn.
</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>yarn.app.mapreduce.am.staging-dir</name>
@@ -240,15 +240,15 @@
<description>
The staging dir used while submitting 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>yarn.app.mapreduce.am.resource.mb</name>
<value>512</value>
<description>The amount of memory the MR AppMaster needs.</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>yarn.app.mapreduce.am.command-opts</name>
@@ -266,8 +266,8 @@
of LD_LIBRARY_PATH in the map / reduce JVM env using the mapreduce.map.env and
mapreduce.reduce.env config settings.
</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>yarn.app.mapreduce.am.admin-command-opts</name>
@@ -282,29 +282,29 @@
of LD_LIBRARY_PATH in the map / reduce JVM env using the mapreduce.map.env and
mapreduce.reduce.env config settings.
</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>yarn.app.mapreduce.am.log.level</name>
<value>INFO</value>
<description>MR App Master process log level.</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.admin.map.child.java.opts</name>
<value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN</value>
<description>This property stores Java options for map tasks.</description>
- <on-ambari-upgrade add="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.admin.reduce.child.java.opts</name>
<value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN</value>
<description>This property stores Java options for reduce tasks.</description>
- <on-ambari-upgrade add="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.application.classpath</name>
@@ -313,8 +313,8 @@
CLASSPATH for MR applications. A comma-separated list of CLASSPATH
entries.
</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.am.max-attempts</name>
@@ -325,8 +325,8 @@
set by resourcemanager. Otherwise, it will be override. The default number is
set to 2, to allow at least one retry for AM.
</description>
- <on-ambari-upgrade add="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.map.java.opts</name>
@@ -334,8 +334,8 @@
<description>
Larger heap-size for child jvms of maps.
</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.java.opts</name>
@@ -343,8 +343,8 @@
<description>
Larger heap-size for child jvms of reduces.
</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.map.log.level</name>
@@ -353,8 +353,8 @@
The logging level for the map task. The allowed levels are:
OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
</description>
- <on-ambari-upgrade add="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.log.level</name>
@@ -363,8 +363,8 @@
The logging level for the reduce task. The allowed levels are:
OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
</description>
- <on-ambari-upgrade add="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.admin.user.env</name>
@@ -374,8 +374,8 @@
This is not an additive property. You must preserve the original value if
you want your map and reduce tasks to have access to native libraries (compression, etc)
</description>
- <on-ambari-upgrade add="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.output.fileoutputformat.compress</name>
@@ -383,7 +383,7 @@
<description>
Should the job outputs 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>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/capacity-scheduler.xml
index 80d0e91..55fea9d 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/capacity-scheduler.xml
@@ -22,8 +22,8 @@
<description>
Maximum number of applications that can be pending and running.
</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>yarn.scheduler.capacity.maximum-am-resource-percent</name>
@@ -33,8 +33,8 @@
application masters i.e. controls number of concurrent running
applications.
</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>yarn.scheduler.capacity.root.queues</name>
@@ -42,8 +42,8 @@
<description>
The queues at the this level (root is the root queue).
</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>yarn.scheduler.capacity.root.capacity</name>
@@ -54,15 +54,15 @@
The child queues capacity should add up to their parent queue's capacity
or less.
</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>yarn.scheduler.capacity.root.default.capacity</name>
<value>100</value>
<description>Default queue target capacity.</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>yarn.scheduler.capacity.root.default.user-limit-factor</name>
@@ -70,8 +70,8 @@
<description>
Default queue user limit a percentage from 0.0 to 1.0.
</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>yarn.scheduler.capacity.root.default.maximum-capacity</name>
@@ -79,8 +79,8 @@
<description>
The maximum capacity of the default queue.
</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>yarn.scheduler.capacity.root.default.state</name>
@@ -88,8 +88,8 @@
<description>
The state of the default queue. State can be one of RUNNING or STOPPED.
</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>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
@@ -97,8 +97,8 @@
<description>
The ACL of who can submit jobs to the default queue.
</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>yarn.scheduler.capacity.root.default.acl_administer_jobs</name>
@@ -106,8 +106,8 @@
<description>
The ACL of who can administer jobs on the default queue.
</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>yarn.scheduler.capacity.root.acl_administer_queue</name>
@@ -116,8 +116,8 @@
The ACL for who can administer this queue i.e. change sub-queue
allocations.
</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>yarn.scheduler.capacity.node-locality-delay</name>
@@ -128,8 +128,8 @@
Typically this should be set to number of nodes in the cluster, By default is setting
approximately number of nodes in one rack which is 40.
</description>
- <on-ambari-upgrade add="false" 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>yarn.scheduler.capacity.default.minimum-user-limit-percent</name>
@@ -137,7 +137,7 @@
<description>
Default minimum queue resource limit depends on the number of users who have submitted applications.
</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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
index c595f3a..081055c 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
@@ -24,15 +24,15 @@
<name>yarn_log_dir_prefix</name>
<value>/var/log/hadoop-yarn</value>
<description>YARN Log Dir Prefix</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>yarn_pid_dir_prefix</name>
<value>/var/run/hadoop-yarn</value>
<description>YARN PID Dir Prefix</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>yarn_user</name>
@@ -44,43 +44,43 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <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>yarn_heapsize</name>
<value>1024</value>
<description>Max heapsize for all YARN components using a numerical value in the scale of MB</description>
- <on-ambari-upgrade add="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>resourcemanager_heapsize</name>
<value>1024</value>
<description>Max heapsize for ResourceManager using a numerical value in the scale of MB</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>nodemanager_heapsize</name>
<value>1024</value>
<description>Max heapsize for NodeManager using a numerical value in the scale of MB</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>min_user_id</name>
<value>1000</value>
<description>Set to 0 to disallow root from submitting jobs. Set to 1000 to disallow all superusers from submitting jobs</description>
- <on-ambari-upgrade add="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>apptimelineserver_heapsize</name>
<value>1024</value>
<description>Max heapsize for AppTimelineServer using a numerical value in the scale of MB</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>
<!-- yarn-env.sh -->
<property>
@@ -201,7 +201,7 @@ YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE"
<value-attributes>
<type>content</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml
index cece269..3426f8f 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml
@@ -67,7 +67,7 @@ log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$Appl
<value-attributes>
<type>content</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml
index fc6708f..862b37b 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml
@@ -23,22 +23,22 @@
<name>yarn.resourcemanager.hostname</name>
<value>localhost</value>
<description>The hostname of the RM.</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>yarn.resourcemanager.resource-tracker.address</name>
<value>localhost:8025</value>
<description> The address of ResourceManager. </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>yarn.resourcemanager.scheduler.address</name>
<value>localhost:8030</value>
<description>The address of the scheduler interface.</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>yarn.resourcemanager.address</name>
@@ -47,22 +47,22 @@
The address of the applications manager interface in the
RM.
</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>yarn.resourcemanager.admin.address</name>
<value>localhost:8141</value>
<description>The address of the RM admin interface.</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>yarn.resourcemanager.scheduler.class</name>
<value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value>
<description>The class to use as the resource scheduler.</description>
- <on-ambari-upgrade add="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>yarn.scheduler.minimum-allocation-mb</name>
@@ -72,8 +72,8 @@
in MBs. Memory requests lower than this won't take effect,
and the specified value will get allocated at minimum.
</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>yarn.scheduler.maximum-allocation-mb</name>
@@ -83,45 +83,45 @@
in MBs. Memory requests higher than this won't take effect,
and will get capped to 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>yarn.acl.enable</name>
<value>false</value>
<description> Are acls enabled. </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>yarn.admin.acl</name>
<value/>
<description> ACL of who can be admin of the YARN cluster. </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>
<!-- NodeManager -->
<property>
<name>yarn.nodemanager.address</name>
<value>0.0.0.0:45454</value>
<description>The address of the container manager in the NM.</description>
- <on-ambari-upgrade add="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>yarn.nodemanager.resource.memory-mb</name>
<value>5120</value>
<description>Amount of physical memory, in MB, that can be allocated
for containers.</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>yarn.application.classpath</name>
<value>/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*</value>
<description>Classpath for typical applications.</description>
- <on-ambari-upgrade add="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>yarn.nodemanager.vmem-pmem-ratio</name>
@@ -131,37 +131,37 @@
expressed in terms of physical memory, and virtual memory usage
is allowed to exceed this allocation by this ratio.
</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>yarn.nodemanager.container-executor.class</name>
<value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value>
<description>ContainerExecutor for launching containers</description>
- <on-ambari-upgrade add="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>yarn.nodemanager.linux-container-executor.group</name>
<value>hadoop</value>
<description>Unix group of the NodeManager</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>yarn.nodemanager.aux-services</name>
<value>mapreduce_shuffle</value>
<description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can
not start with numbers</description>
- <on-ambari-upgrade add="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>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
<value>org.apache.hadoop.mapred.ShuffleHandler</value>
<description>The auxiliary service class to use </description>
- <on-ambari-upgrade add="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>yarn.nodemanager.log-dirs</name>
@@ -173,8 +173,8 @@
named container_{$contid}. Each container directory will contain the files
stderr, stdin, and syslog generated by that container.
</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>yarn.nodemanager.local-dirs</name>
@@ -186,8 +186,8 @@
Individual containers' work directories, called container_${contid}, will
be subdirectories of this.
</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>yarn.nodemanager.container-monitor.interval-ms</name>
@@ -196,8 +196,8 @@
The interval, in milliseconds, for which the node manager
waits between two cycles of monitoring its containers' memory usage.
</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>
@@ -210,15 +210,15 @@
<name>yarn.nodemanager.health-checker.interval-ms</name>
<value>135000</value>
<description>Frequency of running node health script.</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>yarn.nodemanager.health-checker.script.timeout-ms</name>
<value>60000</value>
<description>Script time out period.</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>yarn.nodemanager.log.retain-second</name>
@@ -227,22 +227,22 @@
Time in seconds to retain user logs. Only applicable if
log aggregation is disabled.
</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>yarn.log-aggregation-enable</name>
<value>true</value>
<description>Whether to enable log aggregation. </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>yarn.nodemanager.remote-app-log-dir</name>
<value>/app-logs</value>
<description>Location to aggregate logs to. </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>yarn.nodemanager.remote-app-log-dir-suffix</name>
@@ -251,8 +251,8 @@
The remote log dir will be created at
{yarn.nodemanager.remote-app-log-dir}/${user}/{thisParam}.
</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>yarn.nodemanager.log-aggregation.compression-type</name>
@@ -260,8 +260,8 @@
<description>
T-file compression types used to compress aggregated logs.
</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>yarn.nodemanager.delete.debug-delay-sec</name>
@@ -281,8 +281,8 @@
of the Yarn applications' log directories is configurable with the
yarn.nodemanager.log-dirs property (see also below).
</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>yarn.log-aggregation.retain-seconds</name>
@@ -291,8 +291,8 @@
How long to keep aggregation logs before deleting them. -1 disables.
Be careful set this too small and you will spam the name node.
</description>
- <on-ambari-upgrade add="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>yarn.nodemanager.admin-env</name>
@@ -301,8 +301,8 @@
Environment variables that should be forwarded from the NodeManager's
environment to the container's.
</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>yarn.nodemanager.disk-health-checker.min-healthy-disks</name>
@@ -314,8 +314,8 @@
If there are less number of healthy local-dirs (or log-dirs) available,
then new containers will not be launched on this node.
</description>
- <on-ambari-upgrade add="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>yarn.resourcemanager.am.max-attempts</name>
@@ -328,8 +328,8 @@
the resourcemanager will override it. The default number is set to 2, to
allow at least one retry for AM.
</description>
- <on-ambari-upgrade add="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>yarn.resourcemanager.webapp.address</name>
@@ -337,8 +337,8 @@
<description>
The address of the RM web application.
</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>yarn.nodemanager.vmem-check-enabled</name>
@@ -346,8 +346,8 @@
<description>
Whether virtual memory limits will be enforced for containers.
</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>yarn.log.server.url</name>
@@ -355,8 +355,8 @@
<description>
URI for the HistoryServer's log resource
</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>yarn.resourcemanager.nodes.exclude-path</name>
@@ -367,8 +367,8 @@
file must be specified. If the value is empty, no hosts are
excluded.
</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>yarn.timeline-service.enabled</name>
@@ -379,8 +379,8 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <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>yarn.timeline-service.store-class</name>
@@ -388,8 +388,8 @@
<description>
Store class name for timeline store
</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>yarn.timeline-service.generic-application-history.store-class</name>
@@ -397,8 +397,8 @@
<description>
Store class name for history store, defaulting to file system store
</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>yarn.timeline-service.leveldb-timeline-store.path</name>
@@ -409,8 +409,8 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <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>yarn.timeline-service.webapp.address</name>
@@ -418,8 +418,8 @@
<description>
The http address of the timeline service web application.
</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>yarn.timeline-service.webapp.https.address</name>
@@ -427,8 +427,8 @@
<description>
The http address of the timeline service web application.
</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>yarn.timeline-service.address</name>
@@ -437,8 +437,8 @@
This is default address for the timeline server to start
the RPC 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>
<description>Enable age off of timeline store data.</description>
@@ -447,8 +447,8 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <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>
<description>Time to live for timeline store data in milliseconds.</description>
@@ -457,8 +457,8 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <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>
<description>Length of time to wait between deletion cycles of leveldb timeline store in milliseconds.</description>
@@ -467,7 +467,7 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
index 30f32ac..4806625 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
@@ -30,57 +30,57 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <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>zk_data_dir</name>
<value>/hadoop/zookeeper</value>
<description>Data directory for ZooKeeper.</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>zk_log_dir</name>
<value>/var/log/zookeeper</value>
<description>ZooKeeper Log 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>zk_pid_dir</name>
<value>/var/run/zookeeper</value>
<description>ZooKeeper Pid 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>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="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>initLimit</name>
<value>10</value>
<description>Ticks to allow for sync at Init.</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>syncLimit</name>
<value>5</value>
<description>Ticks to allow for sync at Runtime.</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>clientPort</name>
<value>2181</value>
<description>Port for running ZK 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>
<!-- zookeeper-env.sh -->
<property>
@@ -103,7 +103,7 @@ export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_
<value-attributes>
<type>content</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
index 1f5031f..cee0cfa 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml
@@ -97,7 +97,7 @@ log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%
<value-attributes>
<type>content</type>
</value-attributes>
- <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/55dd6c8a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
index b06ea45..7bc850c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml
@@ -22,33 +22,33 @@
<property>
<name>fs.AbstractFileSystem.glusterfs.impl</name>
<value>org.apache.hadoop.fs.local.GlusterFs</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>fs.glusterfs.impl</name>
<value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</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>fs.glusterfs.volumes</name>
<description>The name of the gluster volume(s) you would like Hadoop to use. Values should be seperated by commas i.e. gv0, gv1</description>
<value>gv0</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>fs.glusterfs.volume.fuse.gv0</name>
<description>The mount point that corresponds to the fs.glusterfs.volumes value</description>
<value>/mnt/gv0</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>fs.defaultFS</name>
<value>glusterfs:///localhost:8020</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>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
index d7978c3..c4125a0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
@@ -24,50 +24,50 @@
<name>hadoop_pid_dir_prefix</name>
<value>/var/run/hadoop</value>
<description>Hadoop PID Dir Prefix</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_heapsize</name>
<value>1024</value>
<description>Hadoop maximum Java 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>glusterfs_user</name>
<value>root</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>hdfs_log_dir_prefix</name>
<value>/var/log/hadoop</value>
<description>Hadoop Log Dir Prefix</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>namenode_heapsize</name>
<value>1024</value>
<description>NameNode Java 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>namenode_host</name>
<value/>
<description>NameNode 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>snamenode_host</name>
<value/>
<description>Secondary NameNode.</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>proxyuser_group</name>
@@ -77,16 +77,16 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <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_user</name>
<display-name>HDFS User</display-name>
<value>hdfs</value>
<description>User to run HDFS as</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>
@@ -215,7 +215,7 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-a
<value-attributes>
<type>content</type>
</value-attributes>
- <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>