http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml index 91f1809..a531c61 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml @@ -19,7 +19,9 @@ * limitations under the License. */ --> + <configuration supports_final="true"> + <property> <name>java.library.path</name> <value>/usr/local/lib:/opt/local/lib:/usr/lib:/usr/hdp/current/storm-client/lib</value> @@ -27,9 +29,8 @@ for the java.library.path value. java.library.path tells the JVM where to look for native libraries. It is necessary to set this config correctly since Storm uses the ZeroMQ and JZMQ native libs. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>nimbus.childopts</name> <value>-Xmx1024m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM</value> @@ -37,9 +38,8 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>worker.childopts</name> <value>-Xmx768m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-client/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-client/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM</value> @@ -47,9 +47,8 @@ <value-attributes> <type>multiLine</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>supervisor.childopts</name> <value>-Xmx256m _JAAS_PLACEHOLDER -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port={{jmxremote_port}} -javaagent:/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM</value> @@ -57,7 +56,6 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml index b0a0eae..95667cf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml @@ -16,7 +16,9 @@ See the License for the specific language governing permissions and limitations under the License. --> + <configuration supports_final="true" supports_do_not_extend="true"> + <property> <name>tez.lib.uris</name> <value>/hdp/apps/${hdp.version}/tez/tez.tar.gz</value> @@ -24,37 +26,32 @@ Specifying a single .tar.gz or .tgz assumes that a compressed version of the tez libs is being used. This is uncompressed into a tezlibs directory when running containers, and tezlibs/;tezlibs/lib/ are added to the classpath (after . and .*). If multiple files are specified - files are localized as regular files, contents of directories are localized as regular files (non-recursive). </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.cluster.additional.classpath.prefix</name> <value>/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>tez.am.log.level</name> <value>INFO</value> <description>Root Logging level passed to the Tez app master</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.generate.debug.artifacts</name> <value>false</value> <description>Generate debug artifacts such as a text representation of the submitted DAG plan</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.staging-dir</name> <value>/tmp/${user.name}/staging</value> <description>The staging dir used while submitting DAGs</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.resource.memory.mb</name> <value>1536</value> @@ -64,25 +61,22 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.launch.cmd-opts</name> <value>-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC</value> <description>Java options for the Tez AppMaster process. The Xmx value is derived based on tez.am.resource.memory.mb and is 80% of the value by default. Used only if the value is not specified explicitly by the DAG definition. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.launch.cluster-default.cmd-opts</name> <value>-server -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value> <description>Cluster default Java options for the Tez AppMaster process. These will be prepended to the properties specified via tez.am.launch.cmd-opts</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.launch.env</name> <value>LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64</value> @@ -91,9 +85,8 @@ you want to have access to native libraries. Used only if the value is not specified explicitly by the DAG definition. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.task.resource.memory.mb</name> <value>1536</value> @@ -110,25 +103,22 @@ <name>yarn.scheduler.maximum-allocation-mb</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.task.launch.cmd-opts</name> <value>-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC</value> <description>Java options for tasks. The Xmx value is derived based on tez.task.resource.memory.mb and is 80% of this value by default. Used only if the value is not specified explicitly by the DAG definition. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.task.launch.cluster-default.cmd-opts</name> <value>-server -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value> <description>Cluster default Java options for tasks. These will be prepended to the properties specified via tez.task.launch.cmd-opts</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.task.launch.env</name> <value>LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64</value> @@ -137,18 +127,16 @@ you want to have access to native libraries. Used only if the value is not specified explicitly by the DAG definition. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.shuffle-vertex-manager.min-src-fraction</name> <value>0.2</value> <description>In case of a ScatterGather connection, the fraction of source tasks which should complete before tasks for the current vertex are schedule </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.shuffle-vertex-manager.max-src-fraction</name> <value>0.4</value> @@ -156,16 +144,14 @@ completed, all tasks on the current vertex can be scheduled. Number of tasks ready for scheduling on the current vertex scales linearly between min-fraction and max-fraction </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.am-rm.heartbeat.interval-ms.max</name> <value>250</value> <description>The maximum heartbeat interval between the AM and RM in milliseconds</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.grouping.split-waves</name> <value>1.7</value> @@ -173,163 +159,147 @@ a Vertex. 1.7 with 100% queue available implies generating a number of tasks roughly equal to 170% of the available containers on the queue </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.grouping.min-size</name> <value>16777216</value> <description>Lower bound on the size (in bytes) of a grouped split, to avoid generating too many splits </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.grouping.max-size</name> <value>1073741824</value> <description>Upper bound on the size (in bytes) of a grouped split, to avoid generating excessively large split </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.container.reuse.enabled</name> <value>true</value> <description>Configuration to specify whether container should be reused</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.container.reuse.rack-fallback.enabled</name> <value>true</value> <description>Whether to reuse containers for rack local tasks. Active only if reuse is enabled </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.container.reuse.non-local-fallback.enabled</name> <value>false</value> <description>Whether to reuse containers for non-local tasks. Active only if reuse is enabled </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.container.idle.release-timeout-min.millis</name> <value>10000</value> <description>The minimum amount of time to hold on to a container that is idle. Only active when reuse is enabled.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.container.idle.release-timeout-max.millis</name> <value>20000</value> <description>The maximum amount of time to hold on to a container if no task can be assigned to it immediately. Only active when reuse is enabled.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.container.reuse.locality.delay-allocation-millis</name> <value>250</value> <description>The amount of time to wait before assigning a container to the next level of - locality. NODE -> RACK -> NON_LOCAL + locality. NODE -> RACK -> NON_LOCAL </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.max.app.attempts</name> <value>2</value> <description>Specifies the total number of time the app master will run in case recovery is triggered</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.maxtaskfailures.per.node</name> <value>10</value> <description>The maximum number of allowed task attempt failures on a node before it gets marked as blacklisted </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.task.am.heartbeat.counter.interval-ms.max</name> <value>4000</value> <description>Time interval at which task counters are sent to the AM</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.task.get-task.sleep.interval-ms.max</name> <value>200</value> <description>The maximum amount of time, in seconds, to wait before a task asks an AM for another task </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.task.max-events-per-heartbeat</name> <value>500</value> <description>Maximum number of of events to fetch from the AM by the tasks in a single heartbeat.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.session.client.timeout.secs</name> <value>-1</value> <description>Time (in seconds) to wait for AM to come up when trying to submit a DAG from the client </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.session.am.dag.submit.timeout.secs</name> <value>300</value> <description>Time (in seconds) for which the Tez AM should wait for a DAG to be submitted before shutting down </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.counters.max</name> <value>5000</value> <description>The number of allowed counters for the executing DAG</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.counters.max.groups</name> <value>1000</value> <description>The number of allowed counter groups for the executing DAG</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + + <!-- Configuration for runtime components --> + <!-- These properties can be set on a per edge basis by configuring the payload for each edge independently. --> + + <property> <name>tez.runtime.compress</name> <value>true</value> <description>Whether intermediate data should be compressed or not</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.runtime.compress.codec</name> <value>org.apache.hadoop.io.compress.SnappyCodec</value> <description>The coded to be used if compressing intermediate data. Only applicable if tez.runtime.compress is enabled </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.runtime.io.sort.mb</name> <value>512</value> @@ -340,9 +310,8 @@ <name>tez.task.resource.memory.mb</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.runtime.unordered.output.buffer.size-mb</name> <value>100</value> @@ -353,9 +322,8 @@ <name>tez.task.resource.memory.mb</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.history.logging.service.class</name> <value>org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService</value> @@ -363,23 +331,20 @@ Set to org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService to log to ATS Set to org.apache.tez.dag.history.logging.impl.SimpleHistoryLoggingService to log to the filesystem specified by ${fs.defaultFS} </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.runtime.convert.user-payload.to.history-text</name> <value>false</value> <description>Whether to publish configuration information to History logger</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.use.cluster.hadoop-libs</name> <value>false</value> <description>This being true implies that the deployment is relying on hadoop jars being available on the cluster on all nodes.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.am.tez-ui.history-url.template</name> <value>__HISTORY_URL_BASE__?viewPath=%2F%23%2Ftez-app%2F__APPLICATION_ID__</value> @@ -387,13 +352,11 @@ Template replaces __APPLICATION_ID__ with the actual applicationId and __HISTORY_URL_BASE__ with the value from the tez.tez-ui.history-url.base config property </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>tez.tez-ui.history-url.base</name> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml index 5048336..6a3fee4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-env.xml @@ -19,7 +19,10 @@ * limitations under the License. */ --> + <configuration supports_adding_forbidden="true"> + + <!-- mapred-env.sh --> <property> <name>content</name> @@ -45,7 +48,5 @@ export JAVA_LIBRARY_PATH="${JAVA_LIBRARY_PATH}:{{hadoop_java_io_tmpdir}}" <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-site.xml index 9a5abf3..ec8f939 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration-mapred/mapred-site.xml @@ -1,5 +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 @@ -16,8 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. --> + <!-- Put site-specific property overrides in this file. --> -<configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> + +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> + <property> <name>mapreduce.admin.user.env</name> <value>LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64</value> @@ -26,9 +30,8 @@ This is not an additive property. You must preserve the original value if you want your map and reduce tasks to have access to native libraries (compression, etc) </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>mapreduce.application.classpath</name> <value>$PWD/mr-framework/hadoop/share/hadoop/mapreduce/*:$PWD/mr-framework/hadoop/share/hadoop/mapreduce/lib/*:$PWD/mr-framework/hadoop/share/hadoop/common/*:$PWD/mr-framework/hadoop/share/hadoop/common/lib/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/lib/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/lib/*:$PWD/mr-framework/hadoop/share/hadoop/tools/lib/*:/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure</value> @@ -36,16 +39,14 @@ CLASSPATH for MR applications. A comma-separated list of CLASSPATH entries. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>mapreduce.application.framework.path</name> <value>/hdp/apps/${hdp.version}/mapreduce/mapreduce.tar.gz#mr-framework</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>yarn.app.mapreduce.am.admin-command-opts</name> <value>-Dhdp.version=${hdp.version}</value> @@ -62,56 +63,48 @@ of LD_LIBRARY_PATH in the map / reduce JVM env using the mapreduce.map.env and mapreduce.reduce.env config settings. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>mapreduce.admin.map.child.java.opts</name> <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>mapreduce.admin.reduce.child.java.opts</name> <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>mapreduce.reduce.shuffle.fetch.retry.enabled</name> <value>1</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>mapreduce.reduce.shuffle.fetch.retry.interval-ms</name> <value>1000</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>mapreduce.reduce.shuffle.fetch.retry.timeout-ms</name> <value>30000</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>mapreduce.job.emit-timeline-data</name> <value>false</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + <property> <name>mapreduce.jobhistory.bind-host</name> <value>0.0.0.0</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml index 48a1817..28f5dc2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml @@ -1,4 +1,3 @@ -<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + <configuration supports_final="false" supports_adding_forbidden="true"> <property> <name>yarn.scheduler.capacity.resource-calculator</name> @@ -35,23 +35,18 @@ <selection-cardinality>1</selection-cardinality> </value-attributes> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.accessible-node-labels</name> <value>*</value> - <description/> + <description></description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.default-node-label-expression</name> <value> </value> - <description/> + <description></description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-env.xml index 51cc346..2184c0e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-env.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> + <configuration supports_adding_forbidden="true"> <property> <name>yarn_cgroups_enabled</name> @@ -39,7 +40,5 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml index c432cc1..905383a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml @@ -16,14 +16,15 @@ See the License for the specific language governing permissions and limitations under the License. --> + <!-- Put site-specific property overrides in this file. --> -<configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> + +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> + <property> <name>yarn.application.classpath</name> <value>$HADOOP_CONF_DIR,/usr/hdp/current/hadoop-client/*,/usr/hdp/current/hadoop-client/lib/*,/usr/hdp/current/hadoop-hdfs-client/*,/usr/hdp/current/hadoop-hdfs-client/lib/*,/usr/hdp/current/hadoop-yarn-client/*,/usr/hdp/current/hadoop-yarn-client/lib/*</value> <description>Classpath for typical applications.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>hadoop.registry.rm.enabled</name> @@ -31,8 +32,9 @@ <description> Is the registry enabled: does the RM start it up, create the user and system paths, and purge service records when containers, application attempts and applications complete </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <value-attributes> + <type>boolean</type> + </value-attributes> </property> <property> <name>hadoop.registry.zk.quorum</name> @@ -41,15 +43,11 @@ <description> List of hostname:port pairs defining the zookeeper quorum binding for the registry </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.recovery.enabled</name> <value>true</value> <description>Enable the node manager to recover after starting</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.recovery.dir</name> @@ -58,22 +56,16 @@ The local filesystem directory in which the node manager will store state when recovery is enabled. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.client.nodemanager-connect.retry-interval-ms</name> <value>10000</value> <description>Time interval between each attempt to connect to NM</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.client.nodemanager-connect.max-wait-ms</name> <value>60000</value> <description>Max time to wait to establish a connection to NM</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.recovery.enabled</name> @@ -82,8 +74,6 @@ Enable RM to recover state after starting. If true, then yarn.resourcemanager.store.class must be specified. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.work-preserving-recovery.enabled</name> @@ -95,8 +85,6 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.store.class</name> @@ -107,8 +95,6 @@ the store is implicitly fenced; meaning a single ResourceManager is able to use the store at any point in time. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.zk-address</name> @@ -117,43 +103,31 @@ <description> List Host:Port of the ZooKeeper servers to be used by the RM. comma separated host:port pairs, each corresponding to a zk server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002" If the optional chroot suffix is used the example would look like: "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002/app/a" where the client would be rooted at "/app/a" and all paths would be relative to this root - ie getting/setting/etc... "/foo/bar" would result in operations being run on "/app/a/foo/bar" (from the server perspective). </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.zk-state-store.parent-path</name> <value>/rmstore</value> <description>Full path of the ZooKeeper znode where RM state will be stored. This must be supplied when using org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore as the value for yarn.resourcemanager.store.class</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.zk-acl</name> <value>world:anyone:rwcda </value> <description>ACL's to be used for ZooKeeper znodes.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.work-preserving-recovery.scheduling-wait-ms</name> <value>10000</value> <description>Set the amount of time RM waits before allocating new containers on work-preserving-recovery. Such wait period gives RM a chance to settle down resyncing with NMs in the cluster on recovery, before assigning new containers to applications.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.connect.retry-interval.ms</name> <value>30000</value> <description>How often to try connecting to the ResourceManager.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.connect.max-wait.ms</name> <value>900000</value> <description>Maximum time to wait to establish connection to ResourceManager</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.zk-retry-interval-ms</name> @@ -163,83 +137,61 @@ automatically from yarn.resourcemanager.zk-timeout-ms and yarn.resourcemanager.zk-num-retries." </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.zk-num-retries</name> <value>1000</value> <description>Number of times RM tries to connect to ZooKeeper.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.zk-timeout-ms</name> <value>10000</value> <description>ZooKeeper session timeout in milliseconds. Session expiration is managed by the ZooKeeper cluster itself, not by the client. This value is used by the cluster to determine when the client's session expires. Expirations happens when the cluster does not hear from the client within the specified session timeout period (i.e. no heartbeat).</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.state-store.max-completed-applications</name> <value>${yarn.resourcemanager.max-completed-applications}</value> <description>The maximum number of completed applications RM state store keeps, less than or equals to ${yarn.resourcemanager.max-completed-applications}. By default, it equals to ${yarn.resourcemanager.max-completed-applications}. This ensures that the applications kept in the state store are consistent with the applications remembered in RM memory. Any values larger than ${yarn.resourcemanager.max-completed-applications} will be reset to ${yarn.resourcemanager.max-completed-applications}. Note that this value impacts the RM recovery performance.Typically, a smaller value indicates better performance on RM recovery.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.fs.state-store.retry-policy-spec</name> <value>2000, 500</value> <description>hdfs client retry policy specification. hdfs client retry is always enabled. Specified in pairs of sleep-time and number-of-retries and (t0, n0), (t1, n1), ..., the first n0 retries sleep t0 milliseconds on average, the following n1 retries sleep t1 milliseconds on average, and so on.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.fs.state-store.uri</name> <value> </value> <description>RI pointing to the location of the FileSystem path where RM state will be stored. This must be supplied when using org.apache.hadoop.yarn.server.resourcemanager.recovery.FileSystemRMStateStore as the value for yarn.resourcemanager.store.class </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.ha.enabled</name> <value>false</value> <description>enable RM HA or not</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.resources-handler.class</name> <value>org.apache.hadoop.yarn.server.nodemanager.util.DefaultLCEResourcesHandler</value> <description>Pre-requisite to use CGroups</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.hierarchy</name> <value>hadoop-yarn</value> <description>Name of the Cgroups hierarchy under which all YARN jobs will be launched</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.mount</name> <value>false</value> <description>If true, YARN will automount the CGroup, however the directory needs to already exist; else, the cgroup should be mounted by the admin</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage</name> <value>false</value> <description>Strictly limit CPU resource usage to allocated usage even if spare CPU is available</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.resource.cpu-vcores</name> <value>8</value> - <description/> + <description></description> <display-name>Number of virtual cores</display-name> <value-attributes> <type>int</type> @@ -252,8 +204,6 @@ <name>yarn.nodemanager.resource.percentage-physical-cpu-limit</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.resource.percentage-physical-cpu-limit</name> @@ -266,43 +216,31 @@ <maximum>100</maximum> <increment-step>1</increment-step> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.node-labels.manager-class</name> <value>org.apache.hadoop.yarn.server.resourcemanager.nodelabels.MemoryRMNodeLabelsManager</value> <description>If user want to enable this feature, specify it to "org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.node-labels.fs-store.retry-policy-spec</name> <value>2000, 500</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> <property> <name>yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb</name> <value>1000</value> <description>This is related to disk size on the machines, admins should set one of yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb or yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage but not both. If both are set, the more conservative value will be used</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage</name> <value>90</value> <description>This is related to disk size on the machines, admins should set one of yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb or yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage but not both. If both are set, the more conservative value will be used</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds</name> <value>-1</value> <description>Defines how often NMs wake up to upload log files. The default value is -1. By default, the logs will be uploaded whenthe application is finished. By setting this configure, logs can be uploaded periodically when the application is running. The minimum rolling-interval-seconds can be set is 3600.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.log-aggregation.debug-enabled</name> @@ -311,43 +249,31 @@ This configuration is for debug and test purpose. By setting this configuration as true. We can break the lower bound of yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.log-aggregation.num-log-files-per-app</name> <value>30</value> <description>This is temporary solution. The configuration will be deleted once, we find a more scalable method to only write a single log file per LRS.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.system-metrics-publisher.enabled</name> <value>true</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> <property> <name>yarn.resourcemanager.system-metrics-publisher.dispatcher.pool-size</name> <value>10</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> <property> <name>yarn.timeline-service.client.max-retries</name> <value>30</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> <property> <name>yarn.timeline-service.client.retry-interval-ms</name> <value>1000</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> <property> <name>yarn.timeline-service.ttl-enable</name> @@ -358,24 +284,19 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>yarn.timeline-service.recovery.enabled</name> <value>false</value> <description>Enable timeline server to recover state after starting. If true, then yarn.timeline-service.state-store-class must be specified. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.state-store-class</name> <value>org.apache.hadoop.yarn.server.timeline.recovery.LeveldbTimelineStateStore</value> <description>Store class name for timeline state store.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.leveldb-state-store.path</name> @@ -384,9 +305,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>yarn.timeline-service.leveldb-timeline-store.path</name> <value>/hadoop/yarn/timeline</value> @@ -394,8 +314,6 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.read-cache-size</name> @@ -403,8 +321,6 @@ <description> Size of read cache for uncompressed blocks for leveldb timeline store in bytes. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.start-time-read-cache-size</name> @@ -412,8 +328,6 @@ <description> Size of cache for recently read entity start times for leveldb timeline store in number of entities. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.start-time-write-cache-size</name> @@ -421,8 +335,6 @@ <description> Size of cache for recently written entity start times for leveldb timeline store in number of entities. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.http-authentication.type</name> @@ -431,15 +343,11 @@ Defines authentication used for the Timeline Server HTTP endpoint. Supported values are: simple | kerberos | $AUTHENTICATION_HANDLER_CLASSNAME </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.http-authentication.simple.anonymous.allowed</name> <value>true</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> <property> <name>yarn.resourcemanager.webapp.delegation-token-auth-filter.enabled</name> @@ -450,41 +358,31 @@ tokens(fallback to kerberos if the tokens are missing). Only applicable when the http authentication type is kerberos. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.bind-host</name> <value>0.0.0.0</value> <description>Default value is 0.0.0.0, when this is set the service will bind on all interfaces. I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values, with blank as the default.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.bind-host</name> <value>0.0.0.0</value> <description>Default value is 0.0.0.0, when this is set the service will bind on all interfaces. I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values, with blank as the default.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.bind-host</name> <value>0.0.0.0</value> <description>Default value is 0.0.0.0, when this is set the service will bind on all interfaces. I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values, with blank as the default.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.node-labels.fs-store.root-dir</name> <value>/system/yarn/node-labels</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> <property> <name>yarn.scheduler.minimum-allocation-vcores</name> <value>1</value> - <description/> + <description></description> <display-name>Minimum Container Size (VCores)</display-name> <value-attributes> <type>int</type> @@ -498,13 +396,11 @@ <name>yarn.nodemanager.resource.cpu-vcores</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.maximum-allocation-vcores</name> <value>8</value> - <description/> + <description></description> <display-name>Maximum Container Size (VCores)</display-name> <value-attributes> <type>int</type> @@ -518,8 +414,6 @@ <name>yarn.nodemanager.resource.cpu-vcores</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.node-labels.enabled</name> @@ -529,6 +423,9 @@ </description> <display-name>Node Labels</display-name> <value-attributes> + <type>boolean</type> + </value-attributes> + <value-attributes> <type>value-list</type> <entries> <entry> @@ -542,16 +439,12 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.node-labels.manager-class</name> <value>org.apache.hadoop.yarn.server.resourcemanager.nodelabels.MemoryRMNodeLabelsManager</value> <description>If user want to enable this feature, specify it to "org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager</description> <deleted>true</deleted> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.container-executor.class</name> @@ -567,8 +460,6 @@ <name>hadoop.security.authentication</name> </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.group</name> @@ -579,13 +470,11 @@ <type>yarn-env</type> <name>yarn_cgroups_enabled</name> </property> - <property> - <type>cluster-env</type> - <name>user_group</name> - </property> + <property> + <type>cluster-env</type> + <name>user_group</name> + </property> </depends-on> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.scheduler.monitor.enable</name> @@ -605,7 +494,5 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> -</configuration> +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/core-site.xml index f9a1eac..8f6a113 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/core-site.xml @@ -1,6 +1,7 @@ <?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. @@ -16,123 +17,113 @@ See the License for the specific language governing permissions and limitations under the License. --> -<configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> - <!-- HDFS Configurations --> - <property> - <name>fs.defaultFS</name> - <value/> - <description>Provide VIPRFS bucket details using the format viprfs://$BUCKET_NAME.$NAMESPACE.$SITE_NAME_from_fs.vipr.installations</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>hadoop.security.authentication</name> - <value>simple</value> - <description>Supported values: simple, kerberos</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>hadoop.security.authorization</name> - <value>false</value> - <description>Supported values true, false</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>hadoop.security.auth_to_local</name> - <value>DEFAULT</value> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.permissions.umask-mode</name> - <value>022</value> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <!-- VIPRFS Configurations --> - <property> - <name>fs.vipr.installations</name> - <value>Site1</value> - <description>Provide site name of the tenant</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.vipr.installation.Site1.hosts</name> - <value/> - <description>Provide ECS node IPs or VIP</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.vipr.installation.Site1.resolution</name> - <value>dynamic</value> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.vipr.installation.Site1.resolution.dynamic.time_to_live_ms</name> - <value>900000</value> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.viprfs.auth.anonymous_translation</name> - <value>LOCAL_USER</value> - <final>true</final> - <description>Supported values are LOCAL_USER. Applicable only for insecure cluster deployment.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.viprfs.auth.identity_translation</name> - <value>NONE</value> - <description>Supported values are NONE(default), FIXED_REALM, and CURRENT_USER_REALM</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <!-- Moving the configuration to kerberos.json as this is applicable to only secure cluster + +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> + + <!-- HDFS Configurations --> + + <property> + <name>fs.defaultFS</name> + <value></value> + <description>Provide VIPRFS bucket details using the format viprfs://$BUCKET_NAME.$NAMESPACE.$SITE_NAME_from_fs.vipr.installations</description> + </property> + + <property> + <name>hadoop.security.authentication</name> + <value>simple</value> + <description>Supported values: simple, kerberos</description> + </property> + + <property> + <name>hadoop.security.authorization</name> + <value>false</value> + <description>Supported values true, false</description> + </property> + + <property> + <name>hadoop.security.auth_to_local</name> + <value>DEFAULT</value> + </property> + + <property> + <name>fs.permissions.umask-mode</name> + <value>022</value> + </property> + + <!-- VIPRFS Configurations --> + + <property> + <name>fs.vipr.installations</name> + <value>Site1</value> + <description>Provide site name of the tenant</description> + </property> + + <property> + <name>fs.vipr.installation.Site1.hosts</name> + <value></value> + <description>Provide ECS node IPs or VIP</description> + </property> + + <property> + <name>fs.vipr.installation.Site1.resolution</name> + <value>dynamic</value> + </property> + + <property> + <name>fs.vipr.installation.Site1.resolution.dynamic.time_to_live_ms</name> + <value>900000</value> + </property> + + <property> + <name>fs.viprfs.auth.anonymous_translation</name> + <value>LOCAL_USER</value> + <final>true</final> + <description>Supported values are LOCAL_USER. Applicable only for insecure cluster deployment.</description> + </property> + + <property> + <name>fs.viprfs.auth.identity_translation</name> + <value>NONE</value> + <description>Supported values are NONE(default), FIXED_REALM, and CURRENT_USER_REALM</description> + </property> + + <!-- Moving the configuration to kerberos.json as this is applicable to only secure cluster <property> <name>viprfs.security.principal</name> <value>NONE</value> <description>Modify the value for secure cluster setup. Provide object engine security principal name using the format: vipr/_HOST@ECS_REALM</description> </property> --> - <property> - <name>fs.viprfs.impl</name> - <value>com.emc.hadoop.fs.vipr.ViPRFileSystem</value> - <final>true</final> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.AbstractFileSystem.viprfs.impl</name> - <value>com.emc.hadoop.fs.vipr.ViPRAbstractFileSystem</value> - <final>true</final> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.trace.viprfs.dfs.impl</name> - <value>com.emc.hadoop.fs.trace.TraceDistributedFileSystem</value> - <final>true</final> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.trace.viprfs.dfs.inner</name> - <value>org.apache.hadoop.hdfs.DistributedFileSystemShim</value> - <final>true</final> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>fs.viprfs.dfs.impl</name> - <value>org.apache.hadoop.hdfs.DistributedFileSystemShim</value> - <final>true</final> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + + <property> + <name>fs.viprfs.impl</name> + <value>com.emc.hadoop.fs.vipr.ViPRFileSystem</value> + <final>true</final> + </property> + + <property> + <name>fs.AbstractFileSystem.viprfs.impl</name> + <value>com.emc.hadoop.fs.vipr.ViPRAbstractFileSystem</value> + <final>true</final> + </property> + + <property> + <name>fs.trace.viprfs.dfs.impl</name> + <value>com.emc.hadoop.fs.trace.TraceDistributedFileSystem</value> + <final>true</final> + </property> + + <property> + <name>fs.trace.viprfs.dfs.inner</name> + <value>org.apache.hadoop.hdfs.DistributedFileSystemShim</value> + <final>true</final> + </property> + + <property> + <name>fs.viprfs.dfs.impl</name> + <value>org.apache.hadoop.hdfs.DistributedFileSystemShim</value> + <final>true</final> + </property> + </configuration> + http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml index 2b018f2..1c20f3e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml @@ -19,13 +19,12 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> <property> <name>hdfs_log_dir_prefix</name> <value>/var/log/hadoop</value> <description>Hadoop Log Dir Prefix</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>proxyuser_group</name> @@ -36,8 +35,6 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>hdfs_user</name> @@ -48,8 +45,6 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>user_group</name> @@ -59,8 +54,6 @@ <value-attributes> <type>user</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- hadoop-env.sh --> <property> @@ -119,12 +112,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 @@ -147,7 +140,6 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-a <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hdfs-site.xml index 64d59f0..f18ef11 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hdfs-site.xml @@ -19,17 +19,17 @@ * limitations under the License. */ --> + <configuration> + <property> <name>dfs.permissions.enabled</name> <value>true</value> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>dfs.permissions.superusergroup</name> <value>hdfs</value> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml index 9efa800..a5678ee 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-env.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> + <configuration supports_adding_forbidden="true"> <!-- hbase-env.sh --> <property> @@ -105,7 +106,6 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-site.xml index cc1f666..db83c3f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/configuration/hbase-site.xml @@ -20,10 +20,8 @@ */ --> <configuration> - <property> - <name>hbase.rootdir</name> - <value/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> + <property> + <name>hbase.rootdir</name> + <value></value> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/TEZ/configuration/tez-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/TEZ/configuration/tez-site.xml index 60fc0fe..4b7d3a4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/TEZ/configuration/tez-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/TEZ/configuration/tez-site.xml @@ -16,12 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> + <configuration supports_final="true"> <property> <name>tez.cluster.additional.classpath.prefix</name> <value>/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure:/usr/lib/hadoop/lib/*</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration-mapred/mapred-site.xml index dd528ef..3547630 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration-mapred/mapred-site.xml @@ -1,5 +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 @@ -16,8 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. --> + <!-- Put site-specific property overrides in this file. --> -<configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> + +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> + <property> <name>mapreduce.application.classpath</name> <value>$PWD/mr-framework/hadoop/share/hadoop/mapreduce/*:$PWD/mr-framework/hadoop/share/hadoop/mapreduce/lib/*:$PWD/mr-framework/hadoop/share/hadoop/common/*:$PWD/mr-framework/hadoop/share/hadoop/common/lib/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/lib/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/lib/*:$PWD/mr-framework/hadoop/share/hadoop/tools/lib/*:/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure:/usr/lib/hadoop/lib/*</value> @@ -25,7 +29,6 @@ CLASSPATH for MR applications. A comma-separated list of CLASSPATH entries. </description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration/yarn-site.xml index 208e530..3d58404 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/configuration/yarn-site.xml @@ -16,13 +16,14 @@ See the License for the specific language governing permissions and limitations under the License. --> + <!-- Put site-specific property overrides in this file. --> -<configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> + +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> + <property> <name>yarn.application.classpath</name> <value>$HADOOP_CONF_DIR,/usr/hdp/current/hadoop-client/*,/usr/hdp/current/hadoop-client/lib/*,/usr/hdp/current/hadoop-hdfs-client/*,/usr/hdp/current/hadoop-hdfs-client/lib/*,/usr/hdp/current/hadoop-yarn-client/*,/usr/hdp/current/hadoop-yarn-client/lib/*,/usr/lib/hadoop/lib/*</value> <description>Classpath for typical applications.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml index 3ecd24c..f1fa4de 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/configuration/cluster-env.xml @@ -19,5 +19,6 @@ * limitations under the License. */ --> + <configuration> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml index 006edbc..35a5d44 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/configuration/accumulo-log4j.xml @@ -19,50 +19,46 @@ * limitations under the License. */ --> + <configuration supports_adding_forbidden="true"> + <property> <name>audit_log_level</name> <value>OFF</value> <description>Log level for audit logging</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>monitor_forwarding_log_level</name> <value>WARN</value> <description>Log level for logging forwarded to the Accumulo Monitor</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>debug_log_size</name> <value>512M</value> <description>Size of each debug rolling log file</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>debug_num_logs</name> <value>10</value> <description>Number of rolling debug log files to keep</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>info_log_size</name> <value>512M</value> <description>Size of each info rolling log file</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>info_num_logs</name> <value>10</value> <description>Number of rolling info log files to keep</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>content</name> <display-name>accumulo-log4j template</display-name> @@ -115,7 +111,6 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + </configuration>
