http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml index 671f328..0544cf3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration-mapred/mapred-site.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,72 +16,82 @@ 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";> - - -<!-- GLUSTERFS properties --> +<configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> + <!-- GLUSTERFS properties --> <property> <name>mapreduce.jobhistory.intermediate-done-dir</name> <value>glusterfs:///mr-history/tmp</value> <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"/> </property> - <property> <name>mapreduce.jobhistory.done-dir</name> <value>glusterfs:///mr-history/done</value> <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"/> </property> <property> - <name>yarn.app.mapreduce.am.staging-dir</name> - <value>glusterfs:///user</value> - <description> + <name>yarn.app.mapreduce.am.staging-dir</name> + <value>glusterfs:///user</value> + <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"/> </property> <property> - <name>mapred.healthChecker.script.path</name> - <value>glusterfs:///mapred/jobstatus</value> - </property> + <name>mapred.healthChecker.script.path</name> + <value>glusterfs:///mapred/jobstatus</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> <property> - <name>mapred.job.tracker.history.completed.location</name> - <value>glusterfs:///mapred/history/done</value> + <name>mapred.job.tracker.history.completed.location</name> + <value>glusterfs:///mapred/history/done</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.system.dir</name> <value>glusterfs:///mapred/system</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapreduce.jobtracker.staging.root.dir</name> <value>glusterfs:///user</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>mapred.healthChecker.script.path</name> + <value>glusterfs:///mapred/jobstatus</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>mapred.job.tracker.history.completed.location</name> + <value>glusterfs:///mapred/history/done</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>mapred.system.dir</name> + <value>glusterfs:///mapred/system</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>mapreduce.jobtracker.staging.root.dir</name> + <value>glusterfs:///user</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -<property> -<name>mapred.healthChecker.script.path</name> -<value>glusterfs:///mapred/jobstatus</value> -</property> - -<property> -<name>mapred.job.tracker.history.completed.location</name> -<value>glusterfs:///mapred/history/done</value> -</property> - -<property> -<name>mapred.system.dir</name> -<value>glusterfs:///mapred/system</value> -</property> - -<property> -<name>mapreduce.jobtracker.staging.root.dir</name> -<value>glusterfs:///user</value> -</property> - </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/capacity-scheduler.xml index b99849b..6f597a2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/capacity-scheduler.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -14,17 +15,16 @@ See the License for the specific language governing permissions and limitations under the License. --> - <configuration supports_final="false"> - <property> <name>yarn.scheduler.capacity.maximum-applications</name> <value>10000</value> <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"/> </property> - <property> <name>yarn.scheduler.capacity.maximum-am-resource-percent</name> <value>0.2</value> @@ -33,16 +33,18 @@ 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"/> </property> - <property> <name>yarn.scheduler.capacity.root.queues</name> <value>default</value> <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"/> </property> - <property> <name>yarn.scheduler.capacity.root.capacity</name> <value>100</value> @@ -52,54 +54,61 @@ 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"/> </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"/> </property> - <property> <name>yarn.scheduler.capacity.root.default.user-limit-factor</name> <value>1</value> <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"/> </property> - <property> <name>yarn.scheduler.capacity.root.default.maximum-capacity</name> <value>100</value> <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"/> </property> - <property> <name>yarn.scheduler.capacity.root.default.state</name> <value>RUNNING</value> <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"/> </property> - <property> <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name> <value>*</value> <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"/> </property> - <property> <name>yarn.scheduler.capacity.root.default.acl_administer_jobs</name> <value>*</value> <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"/> </property> - <property> <name>yarn.scheduler.capacity.root.acl_administer_queue</name> <value>*</value> @@ -107,8 +116,9 @@ 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"/> </property> - <property> <name>yarn.scheduler.capacity.node-locality-delay</name> <value>40</value> @@ -118,15 +128,16 @@ 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"/> </property> - <property> <name>yarn.scheduler.capacity.default.minimum-user-limit-percent</name> <value>100</value> <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"/> </property> - - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml index 2cf21fa..c37e994 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml @@ -19,48 +19,63 @@ * limitations under the License. */ --> - <configuration supports_final="false"> <property> <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"/> </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"/> </property> <property> <name>yarn_user</name> <display-name>Yarn User</display-name> <value>yarn</value> <description>YARN User</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" 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"/> </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"/> </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"/> </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"/> </property> <property> <name>namenode_heapsize</name> <value>1024</value> <description>Max heapsize for NameNode 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"/> </property> <!-- yarn-env.sh --> <property> @@ -182,5 +197,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"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml index 893ccd8..4b236db 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.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.0.6/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml index 31556cb..2ae5b72 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml @@ -19,189 +19,225 @@ * limitations under the License. */ --> - <configuration> - <property> - <name>recovery_enabled</name> - <value>true</value> - <description>Auto start enabled or not for this cluster.</description> - </property> - <property> - <name>recovery_type</name> - <value>AUTO_START</value> - <description>Auto start type.</description> - </property> - <property> - <name>recovery_lifetime_max_count</name> - <value>1024</value> - <description>Auto start lifetime maximum count of recovery attempt allowed per host component. This is reset when agent is restarted.</description> - </property> - <property> - <name>recovery_max_count</name> - <value>6</value> - <description>Auto start maximum count of recovery attempt allowed per host component in a window. This is reset when agent is restarted.</description> - </property> - <property> - <name>recovery_window_in_minutes</name> - <value>60</value> - <description>Auto start recovery window size in minutes.</description> - </property> - <property> - <name>recovery_retry_interval</name> - <value>5</value> - <description>Auto start recovery retry gap between tries per host component.</description> - </property> - <property> - <name>security_enabled</name> - <value>false</value> - <description>Hadoop Security</description> - </property> - <property> - <name>kerberos_domain</name> - <value>EXAMPLE.COM</value> - <description>Kerberos realm.</description> - </property> - <property> - <name>ignore_groupsusers_create</name> - <display-name>Skip group modifications during install</display-name> - <value>false</value> - <property-type>ADDITIONAL_USER_PROPERTY</property-type> - <description>Whether to ignore failures on users and group creation</description> - <value-attributes> - <overridable>false</overridable> - <type>boolean</type> - </value-attributes> - </property> - <property> - <name>smokeuser</name> - <display-name>Smoke User</display-name> - <value>ambari-qa</value> - <property-type>USER</property-type> - <description>User executing service checks</description> - <value-attributes> - <type>user</type> - <overridable>false</overridable> - </value-attributes> - </property> - <property> - <name>smokeuser_keytab</name> - <value>/etc/security/keytabs/smokeuser.headless.keytab</value> - <description>Path to smoke test user keytab file</description> - </property> - <property> - <name>user_group</name> - <display-name>Hadoop Group</display-name> - <value>hadoop</value> - <property-type>GROUP</property-type> - <description>Hadoop user group.</description> - <value-attributes> - <type>user</type> - <overridable>false</overridable> - </value-attributes> - </property> - <property> - <name>repo_suse_rhel_template</name> - <value>[{{repo_id}}] + <property> + <name>recovery_enabled</name> + <value>true</value> + <description>Auto start enabled or not for this cluster.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>recovery_type</name> + <value>AUTO_START</value> + <description>Auto start type.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>recovery_lifetime_max_count</name> + <value>1024</value> + <description>Auto start lifetime maximum count of recovery attempt allowed per host component. This is reset when agent is restarted.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>recovery_max_count</name> + <value>6</value> + <description>Auto start maximum count of recovery attempt allowed per host component in a window. This is reset when agent is restarted.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>recovery_window_in_minutes</name> + <value>60</value> + <description>Auto start recovery window size in minutes.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>recovery_retry_interval</name> + <value>5</value> + <description>Auto start recovery retry gap between tries per host component.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>security_enabled</name> + <value>false</value> + <description>Hadoop Security</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>kerberos_domain</name> + <value>EXAMPLE.COM</value> + <description>Kerberos realm.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>ignore_groupsusers_create</name> + <display-name>Skip group modifications during install</display-name> + <value>false</value> + <property-type>ADDITIONAL_USER_PROPERTY</property-type> + <description>Whether to ignore failures on users and group creation</description> + <value-attributes> + <overridable>false</overridable> + <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>smokeuser</name> + <display-name>Smoke User</display-name> + <value>ambari-qa</value> + <property-type>USER</property-type> + <description>User executing service checks</description> + <value-attributes> + <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"/> + </property> + <property> + <name>smokeuser_keytab</name> + <value>/etc/security/keytabs/smokeuser.headless.keytab</value> + <description>Path to smoke test user keytab file</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>user_group</name> + <display-name>Hadoop Group</display-name> + <value>hadoop</value> + <property-type>GROUP</property-type> + <description>Hadoop user group.</description> + <value-attributes> + <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"/> + </property> + <property> + <name>repo_suse_rhel_template</name> + <value>[{{repo_id}}] name={{repo_id}} {% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% endif %} path=/ enabled=1 gpgcheck=0</value> - <description>Template of repositories for rhel and suse.</description> - </property> - <property> - <name>repo_ubuntu_template</name> - <value>{{package_type}} {{base_url}} {{components}}</value> - <description>Template of repositories for ubuntu.</description> - </property> - - <property> - <name>override_uid</name> - <value>true</value> - <property-type>ADDITIONAL_USER_PROPERTY</property-type> - <display-name>Have Ambari manage UIDs</display-name> - <description>Have Ambari manage UIDs</description> - <value-attributes> - <overridable>false</overridable> - <type>boolean</type> - </value-attributes> - </property> - - <property> - <name>fetch_nonlocal_groups</name> - <value>true</value> - <display-name>Ambari fetch nonlocal groups</display-name> - <description>Ambari requires fetching all the groups. This can be slow + <description>Template of repositories for rhel and suse.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>repo_ubuntu_template</name> + <value>{{package_type}} {{base_url}} {{components}}</value> + <description>Template of repositories for ubuntu.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>override_uid</name> + <value>true</value> + <property-type>ADDITIONAL_USER_PROPERTY</property-type> + <display-name>Have Ambari manage UIDs</display-name> + <description>Have Ambari manage UIDs</description> + <value-attributes> + <overridable>false</overridable> + <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>fetch_nonlocal_groups</name> + <value>true</value> + <display-name>Ambari fetch nonlocal groups</display-name> + <description>Ambari requires fetching all the groups. This can be slow on envs with enabled ldap. Setting this option to false will enable Ambari, to skip user/group management connected with ldap groups.</description> - <value-attributes> - <overridable>false</overridable> - <type>boolean</type> - </value-attributes> - </property> - - <property> - <name>managed_hdfs_resource_property_names</name> - <value></value> - <description>Comma separated list of property names with HDFS resource paths. + <value-attributes> + <overridable>false</overridable> + <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>managed_hdfs_resource_property_names</name> + <value/> + <description>Comma separated list of property names with HDFS resource paths. Resource from this list will be managed even if it is marked as not managed in the stack</description> - <value-attributes> - <overridable>false</overridable> - <empty-value-valid>true</empty-value-valid> - </value-attributes> - </property> - - <property> - <name>stack_tools</name> - <value></value> - <description>Stack specific tools</description> - <property-type>VALUE_FROM_PROPERTY_FILE</property-type> - <value-attributes> - <property-file-name>stack_tools.json</property-file-name> - <property-file-type>json</property-file-type> - </value-attributes> - </property> - - <property> - <name>stack_features</name> - <value></value> - <description>List of features supported by the stack</description> - <property-type>VALUE_FROM_PROPERTY_FILE</property-type> - <value-attributes> - <property-file-name>stack_features.json</property-file-name> - <property-file-type>json</property-file-type> - </value-attributes> - </property> - - <property> - <name>stack_root</name> - <value>/usr/hdp</value> - <description>Stack root folder</description> - </property> - - <property> - <name>alerts_repeat_tolerance</name> - <value>1</value> - <description>The number of consecutive alerts required to transition an alert from the SOFT to the HARD state.</description> - </property> - - <property> - <name>ignore_bad_mounts</name> - <value>false</value> - <description>For properties handled by handle_mounted_dirs this will make Ambari not to create any directories.</description> - </property> - - <property> - <name>create_dirs_on_root</name> - <value>true</value> - <description>For properties handled by handle_mounted_dirs this will make Ambari to create not-existent unknown directories on / partition</description> - </property> - - <property> - <name>one_dir_per_partition</name> - <value>true</value> - <description>For properties handled by handle_mounted_dirs this will make Ambari </description> - </property> - + <value-attributes> + <overridable>false</overridable> + <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>stack_tools</name> + <value/> + <description>Stack specific tools</description> + <property-type>VALUE_FROM_PROPERTY_FILE</property-type> + <value-attributes> + <property-file-name>stack_tools.json</property-file-name> + <property-file-type>json</property-file-type> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>stack_features</name> + <value/> + <description>List of features supported by the stack</description> + <property-type>VALUE_FROM_PROPERTY_FILE</property-type> + <value-attributes> + <property-file-name>stack_features.json</property-file-name> + <property-file-type>json</property-file-type> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>stack_root</name> + <value>/usr/hdp</value> + <description>Stack root folder</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>alerts_repeat_tolerance</name> + <value>1</value> + <description>The number of consecutive alerts required to transition an alert from the SOFT to the HARD state.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>ignore_bad_mounts</name> + <value>false</value> + <description>For properties handled by handle_mounted_dirs this will make Ambari not to create any directories.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>create_dirs_on_root</name> + <value>true</value> + <description>For properties handled by handle_mounted_dirs this will make Ambari to create not-existent unknown directories on / partition</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>one_dir_per_partition</name> + <value>true</value> + <description>For properties handled by handle_mounted_dirs this will make Ambari </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.0.6/services/OOZIE/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/oozie-env.xml index 87a885f..efd97c9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/oozie-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/oozie-env.xml @@ -19,9 +19,7 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> - <!-- oozie-env.sh --> <property> <name>content</name> @@ -96,9 +94,10 @@ export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64 export HADOOP_OPTS="-Dhdp.version=${HDP_VERSION} ${HADOOP_OPTS}" </value> - <value-attributes> - <type>content</type> - </value-attributes> + <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"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml index a48ede3..e0df663 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- /** @@ -24,41 +25,57 @@ <display-name>Falcon User</display-name> <value>falcon</value> <description>Falcon user.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>falcon_port</name> <value>15000</value> <description>Port the Falcon Server listens on.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>falcon_log_dir</name> <value>/var/log/falcon</value> <description>Falcon log directory.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>falcon_pid_dir</name> <value>/var/run/falcon</value> <description>Falcon pid-file directory.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>falcon_local_dir</name> <value>/hadoop/falcon</value> <description>Directory where Falcon data, such as activemq data, is stored.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <!--embeddedmq properties--> <property> <name>falcon.embeddedmq.data</name> <value>/hadoop/falcon/embeddedmq/data</value> <description>Directory in which embeddedmq data is stored.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>falcon.embeddedmq</name> <value>true</value> <description>Whether embeddedmq is enabled or not.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>falcon.emeddedmq.port</name> <value>61616</value> <description>Port that embeddedmq will listen on.</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.GlusterFS/services/FALCON/configuration/falcon-runtime.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-runtime.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-runtime.properties.xml index 94c8755..ddb7f69 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-runtime.properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-runtime.properties.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- /** @@ -22,26 +23,36 @@ <property> <name>*.domain</name> <value>${falcon.app.type}</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>*.log.cleanup.frequency.minutes.retention</name> <value>hours(6)</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>*.log.cleanup.frequency.hours.retention</name> <value>minutes(1)</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>*.log.cleanup.frequency.days.retention</name> <value>days(7)</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>*.log.cleanup.frequency.months.retention</name> <value>months(3)</value> - <description></description> + <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.GlusterFS/services/FALCON/configuration/falcon-startup.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-startup.properties.xml index 7459429..7f6fd65 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-startup.properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-startup.properties.xml @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- /** @@ -23,37 +24,51 @@ <property> <name>*.workflow.engine.impl</name> <value>org.apache.falcon.workflow.engine.OozieWorkflowEngine</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>*.oozie.process.workflow.builder</name> <value>org.apache.falcon.workflow.OozieProcessWorkflowBuilder</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>*.oozie.feed.workflow.builder</name> <value>org.apache.falcon.workflow.OozieFeedWorkflowBuilder</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>*.SchedulableEntityManager.impl</name> <value>org.apache.falcon.resource.SchedulableEntityManager</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>*.ConfigSyncService.impl</name> <value>org.apache.falcon.resource.ConfigSyncService</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>*.ProcessInstanceManager.impl</name> <value>org.apache.falcon.resource.InstanceManager</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>*.catalog.service.impl</name> <value>org.apache.falcon.catalog.HiveCatalogService</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>*.application.services</name> @@ -64,7 +79,9 @@ org.apache.falcon.rerun.service.LateRunService,\ org.apache.falcon.service.LogCleanupService </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>*.configstore.listeners</name> @@ -73,135 +90,187 @@ org.apache.falcon.group.FeedGroupMap,\ org.apache.falcon.service.SharedLibraryHostingService </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>*.broker.impl.class</name> <value>org.apache.activemq.ActiveMQConnectionFactory</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>*.shared.libs</name> <value>activemq-core,ant,geronimo-j2ee-management,hadoop-distcp,jms,json-simple,oozie-client,spring-jms</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <!--common properties--> <property> <name>*.domain</name> <value>${falcon.app.type}</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>*.config.store.uri</name> <value>file:///hadoop/falcon/store</value> <description>Location to store user entity configurations</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>*.system.lib.location</name> <value>${falcon.home}/server/webapp/${falcon.app.type}/WEB-INF/lib</value> <description>Location of libraries that is shipped to Hadoop</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>*.retry.recorder.path</name> <value>${falcon.log.dir}/retry</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.cleanup.service.frequency</name> <value>days(1)</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>*.broker.url</name> <value>tcp://localhost:61616</value> <description>Default Active MQ url</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>*.broker.ttlInMins</name> <value>4320</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>*.entity.topic</name> <value>FALCON.ENTITY.TOPIC</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>*.max.retry.failure.count</name> <value>1</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>*.internal.queue.size</name> <value>1000</value> - <description></description> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <!--properties without default values--> <property> <name>*.falcon.http.authentication.cookie.domain</name> <value>EXAMPLE.COM</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.http.authentication.blacklisted.users</name> - <value></value> + <value/> <description>Comma separated list of black listed users</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <!--authentication properties--> <property> <name>*.falcon.authentication.type</name> <value>simple</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.http.authentication.type</name> <value>simple</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.http.authentication.token.validity</name> <value>36000</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.http.authentication.signature.secret</name> <value>falcon</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.http.authentication.simple.anonymous.allowed</name> <value>true</value> <description>Indicates if anonymous requests are allowed when using 'simple' authentication</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>*.falcon.http.authentication.kerberos.name.rules</name> <value>DEFAULT</value> <description>The kerberos names rules is to resolve kerberos principal names, refer to Hadoop's KerberosName for more details.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <!--kerberos params, must be set during security enabling--> <property> <name>*.falcon.service.authentication.kerberos.principal</name> <value>falcon/[email protected]</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.service.authentication.kerberos.keytab</name> <value>/etc/security/keytabs/falcon.service.keytab</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>*.dfs.namenode.kerberos.principal</name> <value>nn/[email protected]</value> <description>name node principal to talk to config store</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>*.falcon.http.authentication.kerberos.principal</name> <value>HTTP/[email protected]</value> <description>Indicates the Kerberos principal to be used for HTTP endpoint</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>*.falcon.http.authentication.kerberos.keytab</name> <value>/etc/security/keytabs/spnego.service.keytab</value> <description>Location of the keytab file with the credentials for the HTTP principal</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.GlusterFS/services/FALCON/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/oozie-site.xml index 89e914b..0874115 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/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,17 +177,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.GlusterFS/services/GLUSTERFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml index 12dfafc..9cc000f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml @@ -1,7 +1,6 @@ <?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 this work for additional information regarding copyright ownership. @@ -17,27 +16,27 @@ 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";> - -<!-- file system properties --> - +<configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> + <!-- file system properties --> <property> - <name>fs.AbstractFileSystem.glusterfs.impl</name> - <display-name>GlusterFS fs impl</display-name> - <value>org.apache.hadoop.fs.local.GlusterFs</value> + <name>fs.AbstractFileSystem.glusterfs.impl</name> + <display-name>GlusterFS fs impl</display-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"/> </property> - <property> - <name>fs.glusterfs.impl</name> - <value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value> - <display-name>GlusterFS Abstract File System Implementation</display-name> + <name>fs.glusterfs.impl</name> + <value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value> + <display-name>GlusterFS Abstract File System Implementation</display-name> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.defaultFS</name> <value>glusterfs:///localhost:8020</value> - </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.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml index cd3ea79..b5c31ed 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_final="false" supports_adding_forbidden="true"> <property> <name>hadoop_pid_dir_prefix</name> @@ -31,15 +30,19 @@ <editable-only-at-install>true</editable-only-at-install> <visible>false</visible> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> + <property> <name>hadoop_heapsize</name> <value>1024</value> - <display-name>Hadoop maximum Java heap size</display-name> - <description>Hadoop maximum Java heap size</description> - <value-attributes> - <unit>MB</unit> - </value-attributes> + <display-name>Hadoop maximum Java heap size</display-name> + <description>Hadoop maximum Java heap size</description> + <value-attributes> + <unit>MB</unit> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>glusterfs_user</name> @@ -49,6 +52,8 @@ <value-attributes> <visible>false</visible> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hdfs_log_dir_prefix</name> @@ -60,6 +65,8 @@ <editable-only-at-install>true</editable-only-at-install> <visible>false</visible> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>namenode_heapsize</name> @@ -71,16 +78,22 @@ <editable-only-at-install>true</editable-only-at-install> <visible>false</visible> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>namenode_host</name> - <value></value> + <value/> <description>NameNode Host.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>snamenode_host</name> - <value></value> + <value/> <description>Secondary NameNode.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>proxyuser_group</name> @@ -90,12 +103,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"/> </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"/> </property> <!-- <property> @@ -104,7 +121,7 @@ <description>Proxy user group.</description> </property> --> - <!-- hadoop-env.sh --> + <!-- hadoop-env.sh --> <property> <name>content</name> <display-name>hadoop-env template</display-name> @@ -198,12 +215,12 @@ export HADOOP_IDENT_STRING=$USER # Use libraries from standard classpath JAVA_JDBC_LIBS="" #Add libraries required by mysql connector -for jarFile in `ls /usr/share/java/*mysql* 2>/dev/null` +for jarFile in `ls /usr/share/java/*mysql* 2>/dev/null` do JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile done #Add libraries required by oracle connector -for jarFile in `ls /usr/share/java/*ojdbc* 2>/dev/null` +for jarFile in `ls /usr/share/java/*ojdbc* 2>/dev/null` do JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile done @@ -222,8 +239,9 @@ export HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}} export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-amd64-64 </value> <value-attributes> - <type>content</type> + <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration>
