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/02 15:02:59 UTC
[29/47] ambari git commit: AMBARI-16272. Ambari Upgrade shouldn't
automatically add stack configs (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml
index 893ccd8..4b236db 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml
@@ -16,31 +16,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude">
-
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude" supports_final="true">
<!-- ResourceManager -->
-
<property>
<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"/>
</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"/>
</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"/>
</property>
-
<property>
<name>yarn.resourcemanager.address</name>
<value>localhost:8050</value>
@@ -48,20 +47,23 @@
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"/>
</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"/>
</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"/>
</property>
-
<property>
<name>yarn.scheduler.minimum-allocation-mb</name>
<value>512</value>
@@ -70,8 +72,9 @@
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"/>
</property>
-
<property>
<name>yarn.scheduler.maximum-allocation-mb</name>
<value>2048</value>
@@ -80,41 +83,46 @@
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"/>
</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"/>
</property>
-
<property>
<name>yarn.admin.acl</name>
- <value></value>
+ <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"/>
</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"/>
</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"/>
</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"/>
</property>
-
<property>
<name>yarn.nodemanager.vmem-pmem-ratio</name>
<value>2.1</value>
@@ -123,33 +131,38 @@
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"/>
</property>
-
<property>
<name>yarn.nodemanager.container-executor.class</name>
<value>org.apache.hadoop.yarn.server.nodemanager.GlusterContainerExecutor</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"/>
</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"/>
</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"/>
</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"/>
</property>
-
<property>
<name>yarn.nodemanager.log-dirs</name>
<value>/hadoop/yarn/log</value>
@@ -160,8 +173,9 @@
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"/>
</property>
-
<property>
<name>yarn.nodemanager.local-dirs</name>
<value>/hadoop/yarn/local</value>
@@ -172,8 +186,9 @@
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"/>
</property>
-
<property>
<name>yarn.nodemanager.container-monitor.interval-ms</name>
<value>3000</value>
@@ -181,8 +196,9 @@
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"/>
</property>
-
<!--
<property>
<name>yarn.nodemanager.health-checker.script.path</name>
@@ -190,19 +206,20 @@
<description>The health check script to run.</description>
</property>
-->
-
<property>
<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"/>
</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"/>
</property>
-
<property>
<name>yarn.nodemanager.log.retain-second</name>
<value>604800</value>
@@ -210,20 +227,23 @@
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"/>
</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"/>
</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"/>
</property>
-
<property>
<name>yarn.nodemanager.remote-app-log-dir-suffix</name>
<value>logs</value>
@@ -231,16 +251,18 @@
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"/>
</property>
-
<property>
<name>yarn.nodemanager.log-aggregation.compression-type</name>
<value>gz</value>
<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"/>
</property>
-
<property>
<name>yarn.nodemanager.delete.debug-delay-sec</name>
<value>0</value>
@@ -259,8 +281,9 @@
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"/>
</property>
-
<property>
<name>yarn.log-aggregation.retain-seconds</name>
<value>2592000</value>
@@ -268,8 +291,9 @@
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"/>
</property>
-
<property>
<name>yarn.nodemanager.admin-env</name>
<value>MALLOC_ARENA_MAX=$MALLOC_ARENA_MAX</value>
@@ -277,8 +301,9 @@
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"/>
</property>
-
<property>
<name>yarn.nodemanager.disk-health-checker.min-healthy-disks</name>
<value>0.25</value>
@@ -289,8 +314,9 @@
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"/>
</property>
-
<property>
<name>yarn.resourcemanager.am.max-attempts</name>
<value>2</value>
@@ -302,32 +328,36 @@
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"/>
</property>
-
<property>
<name>yarn.resourcemanager.webapp.address</name>
<value>localhost:8088</value>
<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"/>
</property>
-
<property>
<name>yarn.nodemanager.vmem-check-enabled</name>
<value>false</value>
<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"/>
</property>
-
<property>
<name>yarn.log.server.url</name>
<value>http://localhost:19888/jobhistory/logs</value>
<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"/>
</property>
-
<property>
<name>yarn.resourcemanager.nodes.exclude-path</name>
<value>/etc/hadoop/conf/yarn.exclude</value>
@@ -337,56 +367,63 @@
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"/>
</property>
-
<property>
<name>yarn.timeline-service.enabled</name>
<value>true</value>
<description>Indicate to clients whether timeline service is enabled or not.
If enabled, clients will put entities and events to the timeline server.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>yarn.timeline-service.store-class</name>
<value>org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore</value>
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.generic-application-history.store-class</name>
<value>org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore</value>
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.leveldb-timeline-store.path</name>
<value>/mnt/glusterfs/hadoop/yarn/timeline</value>
<description>
Store file name for leveldb timeline store
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>yarn.timeline-service.webapp.address</name>
<value>0.0.0.0:8188</value>
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.webapp.https.address</name>
<value>0.0.0.0:8190</value>
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.address</name>
<value>0.0.0.0:10200</value>
@@ -394,20 +431,28 @@
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"/>
</property>
<property>
<description>Enable age off of timeline store data.</description>
<name>yarn.timeline-service.ttl-enable</name>
<value>true</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<description>Time to live for timeline store data in milliseconds.</description>
<name>yarn.timeline-service.ttl-ms</name>
<value>2678400000</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<description>Length of time to wait between deletion cycles of leveldb timeline store in milliseconds.</description>
<name>yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms</name>
<value>300000</value>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml
index b7254bc..3f03475 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/oozie-site.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
<property>
<name>oozie.service.ELService.ext.functions.coord-job-submit-instances</name>
@@ -40,8 +39,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-action-create-inst</name>
<value>
@@ -65,8 +65,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-action-create</name>
<value>
@@ -90,8 +91,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-job-submit-data</name>
<value>
@@ -116,8 +118,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-action-start</name>
<value>
@@ -144,8 +147,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-sla-submit</name>
<value>
@@ -158,8 +162,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-sla-create</name>
<value>
@@ -172,8 +177,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.HadoopAccessorService.supported.filesystems</name>
<value>*</value>
@@ -183,18 +189,18 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!--web ui should add following properties to oozie site accordingly to FALCON_USER-->
<!--<property>-->
- <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.hosts</name>-->
- <!--<value>*</value>-->
- <!--<description>Falcon proxyuser hosts</description>-->
+ <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.hosts</name>-->
+ <!--<value>*</value>-->
+ <!--<description>Falcon proxyuser hosts</description>-->
<!--</property>-->
-
<!--<property>-->
- <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.groups</name>-->
- <!--<value>*</value>-->
- <!--<description>Falcon proxyuser groups</description>-->
+ <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.groups</name>-->
+ <!--<value>*</value>-->
+ <!--<description>Falcon proxyuser groups</description>-->
<!--</property>-->
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HDFS/configuration/hdfs-site.xml
index d112137..26825ed 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HDFS/configuration/hdfs-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,21 +16,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
<configuration supports_final="true">
-
<property>
<name>dfs.namenode.audit.log.async</name>
<value>true</value>
<description>Whether to enable async auditlog</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>dfs.namenode.fslock.fair</name>
<value>false</value>
<description>Whether fsLock is fair</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
index 9a8f986..bf77220 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
@@ -16,9 +16,7 @@ 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 supports_final="true">
-
<property>
<name>hive.heapsize</name>
<value>1024</value>
@@ -29,8 +27,9 @@ limitations under the License.
<overridable>false</overridable>
<type>int</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>ambari.hive.db.schema.name</name>
<value>hive</value>
@@ -39,8 +38,9 @@ limitations under the License.
<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"/>
</property>
-
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
@@ -50,8 +50,9 @@ limitations under the License.
<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"/>
</property>
-
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>com.mysql.jdbc.Driver</value>
@@ -60,8 +61,9 @@ limitations under the License.
<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"/>
</property>
-
<property>
<name>javax.jdo.option.ConnectionUserName</name>
<value>hive</value>
@@ -71,11 +73,12 @@ limitations under the License.
<type>db_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"/>
</property>
-
<property require-input="true">
<name>javax.jdo.option.ConnectionPassword</name>
- <value></value>
+ <value/>
<property-type>PASSWORD</property-type>
<display-name>Database Password</display-name>
<description>password to use against metastore database</description>
@@ -83,61 +86,70 @@ limitations under the License.
<type>password</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.warehouse.dir</name>
<value>/apps/hive/warehouse</value>
<description>location of default database for the warehouse</description>
<property-type>NOT_MANAGED_HDFS_PATH</property-type>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.sasl.enabled</name>
<value>false</value>
<description>If true, the metastore thrift interface will be secured with SASL.
Clients must authenticate with Kerberos.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.kerberos.keytab.file</name>
<value>/etc/security/keytabs/hive.service.keytab</value>
<description>The path to the Kerberos Keytab file containing the metastore
thrift server's service principal.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.kerberos.principal</name>
<value>hive/_HOST@EXAMPLE.COM</value>
<description>The service principal for the metastore thrift server. The special
string _HOST will be replaced automatically with the correct host name.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.cache.pinobjtypes</name>
<value>Table,Database,Type,FieldSchema,Order</value>
<description>List of comma separated metastore object types that should be pinned in the cache</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.uris</name>
<value>thrift://localhost:9083</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>URI for client to contact metastore server</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.client.socket.timeout</name>
<value>60</value>
<description>MetaStore Client socket timeout in seconds</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.execute.setugi</name>
<value>true</value>
<description>In unsecure mode, setting this property to true will cause the metastore to execute DFS operations using the client's reported user and group permissions. Note that this property must be set on both the client and server sides. Further note that its best effort. If client sets its to true and server sets it to false, client setting will be ignored.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.security.authorization.enabled</name>
<value>false</value>
@@ -145,21 +157,24 @@ limitations under the License.
<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"/>
</property>
-
<property>
<name>hive.security.authorization.manager</name>
<value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</value>
<description>the hive client authorization manager class name.
The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.security.metastore.authorization.manager</name>
<value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</value>
<description>The authorization manager class name to be used in the metastore for authorization. The user-defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider. </description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.pre.event.listeners</name>
<value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener</value>
@@ -167,8 +182,9 @@ limitations under the License.
whenever databases, tables, and partitions are created, altered, or dropped.
Set to org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener
if metastore-side authorization is desired.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.metastore.pre.event.listeners</name>
<value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener</value>
@@ -176,14 +192,16 @@ limitations under the License.
whenever databases, tables, and partitions are created, altered, or dropped.
Set to org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener
if metastore-side authorization is desired.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.security.authenticator.manager</name>
<value>org.apache.hadoop.hive.ql.security.ProxyUserAuthenticator</value>
<description>Hive client authenticator manager class name. The user-defined authenticator class should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. </description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.server2.enable.doAs</name>
<value>true</value>
@@ -191,44 +209,51 @@ limitations under the License.
submitted the query. But if the parameter is set to false, the query will run as the user that the hiveserver2
process runs as.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>fs.hdfs.impl.disable.cache</name>
<value>true</value>
<description>Disable HDFS filesystem cache.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>fs.file.impl.disable.cache</name>
<value>true</value>
<description>Disable local filesystem cache.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.enforce.bucketing</name>
<value>true</value>
<description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.enforce.sorting</name>
<value>true</value>
<description>Whether sorting is enforced. If true, while inserting into the table, sorting is enforced.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.enforce.sortmergebucketmapjoin</name>
<value>true</value>
<description>If the user asked for sort-merge bucketed map-side join, and it cannot be performed, should the query fail or not</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.map.aggr</name>
<value>true</value>
<description>Whether to use map-side aggregation in Hive Group By queries.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.optimize.bucketmapjoin</name>
<value>true</value>
@@ -236,43 +261,49 @@ limitations under the License.
is a multiple of the number of buckets in the other table, the buckets can be joined with each other by setting
this parameter as true.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.optimize.bucketmapjoin.sortedmerge</name>
<value>false</value>
<description> If the tables being joined are sorted and bucketized on the join columns, and they have the same number
of buckets, a sort-merge join can be performed by setting this parameter as true.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.mapred.reduce.tasks.speculative.execution</name>
<value>false</value>
<description>Whether speculative execution for reducers should be turned on.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.join</name>
<value>true</value>
<description>Whether Hive enable the optimization about converting common
join into mapjoin based on the input file size.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.sortmerge.join</name>
<value>true</value>
<description>Will the join be automatically converted to a sort-merge join, if the joined tables pass
the criteria for sort-merge join.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.sortmerge.join.noconditionaltask</name>
<value>true</value>
<description>Required to Enable the conversion of an SMB (Sort-Merge-Bucket) to a map-join SMB.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.join.noconditionaltask</name>
<value>true</value>
@@ -280,8 +311,9 @@ limitations under the License.
size. If this paramater is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than the
specified size, the join is directly converted to a mapjoin (there is no conditional task).
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.join.noconditionaltask.size</name>
<value>1000000000</value>
@@ -289,8 +321,9 @@ limitations under the License.
is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than this size, the join is directly
converted to a mapjoin(there is no conditional task).
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.optimize.reducededuplication.min.reducer</name>
<value>4</value>
@@ -298,8 +331,9 @@ limitations under the License.
That means if reducer-num of the child RS is fixed (order by or forced bucketing) and small, it can make very slow, single MR.
The optimization will be disabled if number of reducers is less than specified value.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.optimize.mapjoin.mapreduce</name>
<value>true</value>
@@ -308,8 +342,9 @@ limitations under the License.
job (for e.g a group by), each map-only job is merged with the following
map-reduce job.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.mapjoin.bucket.cache.size</name>
<value>10000</value>
@@ -317,80 +352,92 @@ limitations under the License.
Size per reducer.The default is 1G, i.e if the input size is 10G, it
will use 10 reducers.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.execution.enabled</name>
<value>true</value>
<description>This flag controls the vectorized mode of query execution as documented in HIVE-4160 (as of Hive 0.13.0)
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.optimize.reducededuplication</name>
<value>true</value>
<description>Remove extra map-reduce jobs if the data is already clustered by the same key which needs to be used again.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.optimize.index.filter</name>
<value>true</value>
<description>
Whether to enable automatic use of indexes
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.execution.engine</name>
<value>mr</value>
<description>Whether to use MR or Tez</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.exec.post.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
<description>Comma-separated list of post-execution hooks to be invoked for each statement.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.exec.pre.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
<description>Comma-separated list of pre-execution hooks to be invoked for each statement.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.exec.failure.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
<description>Comma-separated list of on-failure hooks to be invoked for each statement.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.maxentries</name>
<value>100000</value>
<description>Max number of entries in the vector group by aggregation hashtables.
Exceeding this will trigger a flush irrelevant of memory pressure condition.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.checkinterval</name>
<value>1024</value>
<description>Number of entries added to the group by aggregation hash before a reocmputation of average entry size is performed.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.flush.percent</name>
<value>0.1</value>
<description>Percent of entries in the group by aggregation hash flushed when the memory treshold is exceeded.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.stats.autogather</name>
<value>true</value>
<description>A flag to gather statistics automatically during the INSERT OVERWRITE command.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.tez.container.size</name>
<value>682</value>
@@ -413,20 +460,23 @@ limitations under the License.
<name>yarn.scheduler.maximum-allocation-mb</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.tez.input.format</name>
<value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value>
<description>The default input format for Tez. Tez groups splits in the Application Master.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.tez.java.opts</name>
<value>-server -Xmx545m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps</value>
<description>Java command line options for Tez. The -Xmx parameter value is generally 80% of hive.tez.container.size.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.compute.query.using.stats</name>
<value>true</value>
@@ -435,8 +485,9 @@ limitations under the License.
stored in metastore. For basic stats collection turn on the config hive.stats.autogather to true.
For more advanced stats collection need to run analyze table queries.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.orc.splits.include.file.footer</name>
<value>false</value>
@@ -444,20 +495,23 @@ limitations under the License.
If turned on splits generated by orc will include metadata about the stripes in the file. This
data is read remotely (from the client or HS2 machine) and sent to all the tasks.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.limit.optimize.enable</name>
<value>true</value>
<description>Whether to enable the optimization of trying a smaller subset of data for simple LIMIT first.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.limit.pushdown.memory.usage</name>
<value>0.04</value>
<description>The max memory to be used for hash in RS operator for top K selection.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.default.queues</name>
<value>default</value>
@@ -465,38 +519,44 @@ limitations under the License.
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.sessions.per.default.queue</name>
<value>1</value>
<description>The number of sessions for each queue named in the hive.server2.tez.default.queues.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.initialize.default.sessions</name>
<value>false</value>
<description>Enables a user to use HiveServer2 without enabling Tez for HiveServer2. Users may potentially may want to run queries with Tez without a pool of sessions.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.txn.manager</name>
<value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value>
<description>Select the class to do transaction management. The default DummyTxnManager does no transactions and retains the legacy behavior.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.txn.timeout</name>
<value>300</value>
<description>Time after which transactions are declared aborted if the client has not sent a heartbeat, in seconds.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.txn.max.open.batch</name>
<value>1000</value>
<description>Maximum number of transactions that can be fetched in one call to open_txns(). Increasing this will decrease the number of delta files created when streaming data into Hive. But it will also increase the number of open transactions at any given time, possibly impacting read performance.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.compactor.initiator.on</name>
<value>false</value>
@@ -522,8 +582,9 @@ limitations under the License.
<name>hive_txn_acid</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.compactor.worker.threads</name>
<value>0</value>
@@ -541,44 +602,51 @@ limitations under the License.
<name>hive_txn_acid</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.compactor.worker.timeout</name>
<value>86400L</value>
<description>Time, in seconds, before a given compaction in working state is declared a failure and returned to the initiated state.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.compactor.check.interval</name>
<value>300L</value>
<description>Time in seconds between checks to see if any partitions need compacted. This should be kept high because each check for compaction requires many calls against the NameNode.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.compactor.delta.num.threshold</name>
<value>10</value>
<description>Number of delta files that must exist in a directory before the compactor will attempt a minor compaction.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.compactor.delta.pct.threshold</name>
<value>0.1f</value>
<description>Percentage (by size) of base that deltas can be before major compaction is initiated.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.compactor.abortedtxn.threshold</name>
<value>1000</value>
<description>Number of aborted transactions involving a particular table or partition before major compaction is initiated.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>datanucleus.cache.level2.type</name>
<value>none</value>
<description>Determines caching mechanism DataNucleus L2 cache will use. It is strongly recommended to use default value of 'none' as other values may cause consistency errors in Hive.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.server2.thrift.port</name>
<value>10000</value>
@@ -590,24 +658,27 @@ limitations under the License.
<overridable>false</overridable>
<type>int</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
- <name>hive.server2.authentication.spnego.principal</name>
- <value>HTTP/_HOST@EXAMPLE.COM</value>
- <description>
+ <name>hive.server2.authentication.spnego.principal</name>
+ <value>HTTP/_HOST@EXAMPLE.COM</value>
+ <description>
This keytab would be used by HiveServer2 when Kerberos security is enabled and HTTP transport mode is used.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
- <name>hive.server2.authentication.spnego.keytab</name>
- <value>/etc/security/keytabs/spnego.service.keytab</value>
- <description>
+ <name>hive.server2.authentication.spnego.keytab</name>
+ <value>/etc/security/keytabs/spnego.service.keytab</value>
+ <description>
The SPNEGO service principal would be used by HiveServer2 when Kerberos security is enabled and HTTP transport mode is used.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>hive.server2.support.dynamic.service.discovery</name>
<value>false</value>
@@ -620,14 +691,16 @@ limitations under the License.
<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"/>
</property>
-
<property>
<name>hive.server2.zookeeper.namespace</name>
<value>hiveserver2</value>
<description>The parent node in ZooKeeper used by HiveServer2 when
supporting dynamic service discovery.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
index b4d2965..cb20a31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
@@ -16,9 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
-
<!--
Refer to the oozie-default.xml file for the complete list of
Oozie configuration properties and their default values.
@@ -28,24 +26,27 @@
<value>http://localhost:11000/oozie</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Base Oozie URL.</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.system.id</name>
<value>oozie-${user.name}</value>
<description>
The Oozie system ID.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.systemmode</name>
<value>NORMAL</value>
<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"/>
</property>
-
<property>
<name>oozie.service.AuthorizationService.security.enabled</name>
<value>true</value>
@@ -53,36 +54,41 @@
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"/>
</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>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" 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>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" 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"/>
</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"/>
</property>
-
<property>
<name>oozie.service.CallableQueueService.callable.concurrency</name>
<value>3</value>
@@ -93,16 +99,18 @@
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"/>
</property>
-
<property>
<name>oozie.service.coord.normal.default.timeout</name>
<value>120</value>
<description>Default timeout for a coordinator action input check (in minutes) for normal job.
-1 means infinite timeout
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.db.schema.name</name>
<value>oozie</value>
@@ -113,8 +121,9 @@
<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"/>
</property>
-
<property>
<name>oozie.authentication.type</name>
<value>simple</value>
@@ -122,8 +131,9 @@
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"/>
</property>
-
<property>
<name>oozie.service.WorkflowAppService.system.libpath</name>
<value>/user/${user.name}/share/lib</value>
@@ -132,8 +142,9 @@
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"/>
</property>
-
<property>
<name>use.system.libpath.for.mapreduce.and.pig.jobs</name>
<value>false</value>
@@ -143,10 +154,14 @@
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"/>
</property>
<property>
<name>oozie.authentication.kerberos.name.rules</name>
<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"/>
</property>
<property>
<name>oozie.service.HadoopAccessorService.hadoop.configurations</name>
@@ -159,6 +174,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"/>
</property>
<property>
<name>oozie.service.ActionService.executor.ext.classes</name>
@@ -174,8 +191,9 @@
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"/>
</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,shell-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd,hive-action-0.3.xsd</value>
@@ -183,6 +201,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"/>
</property>
<property>
<name>oozie.service.JPAService.create.db.schema</name>
@@ -193,8 +213,9 @@
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"/>
</property>
-
<property>
<name>oozie.service.JPAService.jdbc.driver</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
@@ -205,8 +226,9 @@
<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"/>
</property>
-
<property>
<name>oozie.service.JPAService.jdbc.url</name>
<value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
@@ -217,8 +239,9 @@
<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"/>
</property>
-
<property>
<name>oozie.service.JPAService.jdbc.username</name>
<value>oozie</value>
@@ -230,16 +253,18 @@
<type>db_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"/>
</property>
-
<property>
<name>oozie.service.JPAService.pool.max.active.conn</name>
<value>10</value>
<description>
Max number of connections.
</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.services</name>
<value>
@@ -278,6 +303,8 @@
org.apache.oozie.service.JobsConcurrencyService
</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"/>
</property>
<property>
<name>oozie.service.URIHandlerService.uri.handlers</name>
@@ -285,6 +312,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"/>
</property>
<property>
<name>oozie.services.ext</name>
@@ -294,6 +323,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"/>
</property>
<property>
<name>oozie.service.coord.push.check.requeue.interval</name>
@@ -301,6 +332,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"/>
</property>
<property>
<name>oozie.credentials.credentialclasses</name>
@@ -308,6 +341,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"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml
index 6218da2..9b59e1c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/PIG/configuration/pig-properties.xml
@@ -19,9 +19,7 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
-
<property>
<name>content</name>
<display-name>pig-properties template</display-name>
@@ -93,6 +91,7 @@ hcat.bin=/usr/bin/hcat
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml
index 427fd9e..8cf516c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<property>
<name>apptimelineserver_heapsize</name>
@@ -31,8 +30,9 @@
<unit>MB</unit>
<type>int</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- yarn-env.sh -->
<property>
<name>content</name>
@@ -155,6 +155,7 @@ YARN_OPTS="$YARN_OPTS -Djava.io.tmpdir={{hadoop_java_io_tmpdir}}"
<value-attributes>
<type>content</type>
</value-attributes>
- </property>
-
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml
index 732cef1..c4ba21a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml
@@ -16,10 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude">
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude" supports_final="true">
<property>
<name>yarn.timeline-service.enabled</name>
<value>true</value>
@@ -29,24 +27,27 @@
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.store-class</name>
<value>org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore</value>
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.generic-application-history.store-class</name>
<value>org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore</value>
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.leveldb-timeline-store.path</name>
<value>/var/log/hadoop-yarn/timeline</value>
@@ -56,8 +57,9 @@
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.webapp.address</name>
<value>localhost:8188</value>
@@ -65,8 +67,9 @@
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.webapp.https.address</name>
<value>localhost:8190</value>
@@ -74,8 +77,9 @@
<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"/>
</property>
-
<property>
<name>yarn.timeline-service.address</name>
<value>localhost:10200</value>
@@ -84,6 +88,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"/>
</property>
<property>
<description>Enable age off of timeline store data.</description>
@@ -92,6 +98,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"/>
</property>
<property>
<description>Time to live for timeline store data in milliseconds.</description>
@@ -100,6 +108,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"/>
</property>
<property>
<description>Length of time to wait between deletion cycles of leveldb timeline store in milliseconds.</description>
@@ -108,5 +118,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"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml
index f1fa4de..3ecd24c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml
@@ -19,6 +19,5 @@
* limitations under the License.
*/
-->
-
<configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/falcon-startup.properties.xml
index 4e4ec67..f74ce84 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/falcon-startup.properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/falcon-startup.properties.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
@@ -19,11 +20,12 @@
*/
-->
<configuration supports_final="false">
-
<property>
<name>*.journal.impl</name>
<value>org.apache.falcon.transaction.SharedFileSystemJournal</value>
<description>Journal implementation class</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>*.application.services</name>
@@ -37,11 +39,15 @@
org.apache.falcon.metadata.MetadataMappingService
</value>
<description>Falcon Services</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>prism.application.services</name>
<value>org.apache.falcon.entity.store.ConfigurationStore</value>
<description>Prism Services</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>prism.configstore.listeners</name>
@@ -50,77 +56,99 @@
org.apache.falcon.group.FeedGroupMap
</value>
<description>Prism Configuration Store Change listeners</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<!--<property>-->
- <!--<name>*.workflow.execution.listeners</name>-->
- <!--<value> </value>-->
- <!--<description>Workflow Job Execution Completion listeners</description>-->
+ <!--<name>*.workflow.execution.listeners</name>-->
+ <!--<value> </value>-->
+ <!--<description>Workflow Job Execution Completion listeners</description>-->
<!--</property>-->
<property>
<name>*.falcon.security.authorization.enabled</name>
<value>false</value>
<description>Authorization Enabled flag</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>*.falcon.enableTLS</name>
<value>false</value>
<description>Falcon TLS Enabled flag</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>*.falcon.security.authorization.superusergroup</name>
<value>falcon</value>
<description>The name of the group of super-users</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>*.falcon.security.authorization.admin.users</name>
<value>falcon,ambari-qa</value>
<description>Admin Users, comma separated users</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>*.falcon.security.authorization.admin.groups</name>
<value>falcon</value>
<description>Admin Group Membership, comma separated users</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>*.falcon.security.authorization.provider</name>
<value>org.apache.falcon.security.DefaultAuthorizationProvider</value>
<description>Authorization Provider Implementation Fully Qualified Class Name</description>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<!-- Falcon Graph and Storage -->
<property>
<name>*.falcon.graph.blueprints.graph</name>
<value>com.thinkaurelius.titan.core.TitanFactory</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>*.falcon.graph.storage.directory</name>
<value>/hadoop/falcon/data/lineage/graphdb</value>
- <description></description>
+ <description/>
<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"/>
</property>
<property>
<name>*.falcon.graph.storage.backend</name>
<value>berkeleyje</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
<property>
<name>*.falcon.graph.serialize.path</name>
<value>/hadoop/falcon/data/lineage</value>
- <description></description>
+ <description/>
<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"/>
</property>
<property>
<name>*.falcon.graph.preserve.history</name>
<value>false</value>
- <description></description>
+ <description/>
<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"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml
index dfe352ad9..1da1589 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
<property>
<name>oozie.service.ELService.ext.functions.coord-job-submit-instances</name>
@@ -42,8 +41,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-action-create-inst</name>
<value>
@@ -69,8 +69,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-action-create</name>
<value>
@@ -96,8 +97,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-job-submit-data</name>
<value>
@@ -124,8 +126,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-action-start</name>
<value>
@@ -154,8 +157,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-sla-submit</name>
<value>
@@ -168,8 +172,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.ELService.ext.functions.coord-sla-create</name>
<value>
@@ -182,8 +187,9 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
-
<property>
<name>oozie.service.HadoopAccessorService.supported.filesystems</name>
<value>*</value>
@@ -193,5 +199,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
+ <on-ambari-upgrade add="false" change="true" delete="true"/>
+ <on-stack-upgrade add="true" change="true" delete="false"/>
</property>
</configuration>