http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml index 1e6d6d6..506617a 100644 --- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml +++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-site.xml @@ -21,22 +21,22 @@ <name>tez.lib.uris</name> <value>hdfs:///apps/tez/,hdfs:///apps/tez/lib/</value> <description>The location of the Tez libraries which will be localized for DAGs</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.log.level</name> <value>INFO</value> <description>Root Logging level passed to the Tez app master</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.staging-dir</name> <value>/tmp/${user.name}/staging</value> <description>The staging dir used while submitting DAGs</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.resource.memory.mb</name> @@ -45,16 +45,16 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- tez picks the java opts from yarn.app.mapreduce.am.command-opts for MR tasks. Likewise for the AM memory MB --> <property> <name>tez.am.java.opts</name> <value>-server -Xmx1024m -Djava.net.preferIPv4Stack=true -XX:+UseNUMA -XX:+UseParallelGC</value> <description>Java options for the Tez AppMaster process. The -Xmx parameter value is generally 0.8 times tez.am.resource.memory.mb config.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.shuffle-vertex-manager.min-src-fraction</name> @@ -62,8 +62,8 @@ <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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.shuffle-vertex-manager.max-src-fraction</name> @@ -72,15 +72,15 @@ 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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.grouping.split-waves</name> @@ -92,8 +92,8 @@ <value-attributes> <type>float</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.grouping.min-size</name> @@ -104,8 +104,8 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.grouping.max-size</name> @@ -116,31 +116,31 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.container.reuse.enabled</name> <value>true</value> <description>Configuration to specify whether container should be reused</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.container.reuse.non-local-fallback.enabled</name> <value>true</value> <description>Whether to reuse containers for non-local tasks. Active only if reuse is enabled </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.container.session.delay-allocation-millis</name> @@ -150,8 +150,8 @@ it immediately. Only active when reuse is enabled. Set to -1 to never release a container in a session </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.container.reuse.locality.delay-allocation-millis</name> @@ -159,8 +159,8 @@ <description>The amount of time to wait before assigning a container to the next level of locality. NODE -> RACK -> NON_LOCAL </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.task.get-task.sleep.interval-ms.max</name> @@ -168,8 +168,8 @@ <description>The maximum amount of time, in seconds, to wait before a task asks an AM for another task </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.am.env</name> @@ -178,8 +178,8 @@ Additional execution environment entries for tez. This is not an additive property. You must preserve the original value if you want to have access to native libraries. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- Client Submission timeout value when submitting DAGs to a session --> <property> @@ -188,8 +188,8 @@ <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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.session.am.dag.submit.timeout.secs</name> @@ -205,8 +205,8 @@ <increment-step>600</increment-step> <unit>seconds</unit> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- Configuration for runtime components --> <!-- These properties can be set on a per edge basis by configuring the payload for each @@ -218,8 +218,8 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.runtime.intermediate-output.compress.codec</name> @@ -227,8 +227,8 @@ <description>The coded to be used if compressing intermediate output. Only applicable if tez.runtime.intermediate-output.should-compress is enabled. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.runtime.intermediate-input.is-compressed</name> @@ -237,23 +237,23 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.runtime.intermediate-input.compress.codec</name> <value>org.apache.hadoop.io.compress.SnappyCodec</value> <description>The coded to be used when reading intermediate compressed input. Only applicable if tez.runtime.intermediate-input.is-compressed is enabled.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- Configuration for ATS integration --> <property> <name>tez.yarn.ats.enabled</name> <value>true</value> <description>Whether to send history events to YARN Application Timeline Server</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml index 1ab6f9f..ce38bf0 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml @@ -29,8 +29,8 @@ <type>directory</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapred_pid_dir_prefix</name> @@ -42,8 +42,8 @@ <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapred_user</name> @@ -55,8 +55,8 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>jobhistory_heapsize</name> @@ -67,22 +67,22 @@ <unit>MB</unit> <type>int</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapred_user_nofile_limit</name> <value>32768</value> <description>Max open files limit setting for MAPREDUCE user.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapred_user_nproc_limit</name> <value>65536</value> <description>Max number of processes limit setting for MAPREDUCE user.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- mapred-env.sh --> <property> @@ -106,7 +106,7 @@ export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml index 2195009..f6f912e 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml @@ -40,8 +40,8 @@ <name>mapreduce.map.memory.mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.map.sort.spill.percent</name> @@ -53,8 +53,8 @@ is already in progress, so spills may be larger than this threshold when it is set to less than .5 </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.task.io.sort.factor</name> @@ -63,8 +63,8 @@ The number of streams to merge at once while sorting files. This determines the number of open file handles. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- map/reduce properties --> <property> @@ -73,8 +73,8 @@ <description> Administrators for MapReduce applications. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.reduce.shuffle.parallelcopies</name> @@ -83,8 +83,8 @@ The default number of parallel transfers run by reduce during the copy(shuffle) phase. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.map.speculative</name> @@ -93,8 +93,8 @@ If true, then multiple instances of some map tasks may be executed in parallel. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.reduce.speculative</name> @@ -103,8 +103,8 @@ If true, then multiple instances of some reduce tasks may be executed in parallel. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.job.reduce.slowstart.completedmaps</name> @@ -113,8 +113,8 @@ Fraction of the number of maps in the job which should be complete before reduces are scheduled for the job. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.job.counters.max</name> @@ -122,8 +122,8 @@ <description> Limit on the number of counters allowed per job. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.reduce.shuffle.merge.percent</name> @@ -134,8 +134,8 @@ storing in-memory map outputs, as defined by mapreduce.reduce.shuffle.input.buffer.percent. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.reduce.shuffle.input.buffer.percent</name> @@ -144,8 +144,8 @@ The percentage of memory to be allocated from the maximum heap size to storing map outputs during the shuffle. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.output.fileoutputformat.compress.type</name> @@ -154,8 +154,8 @@ If the job outputs are to compressed as SequenceFiles, how should they be compressed? Should be one of NONE, RECORD or BLOCK. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.reduce.input.buffer.percent</name> @@ -166,8 +166,8 @@ remaining map outputs in memory must consume less than this threshold before the reduce can begin. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- copied from kryptonite configuration --> <property> @@ -176,8 +176,8 @@ <description> Should the outputs of the maps be compressed before being sent across the network. Uses SequenceFile compression. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.task.timeout</name> @@ -187,8 +187,8 @@ terminated if it neither reads an input, writes an output, nor updates its status string. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.map.memory.mb</name> @@ -212,8 +212,8 @@ <name>yarn.scheduler.minimum-allocation-mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.reduce.memory.mb</name> @@ -237,8 +237,8 @@ <name>yarn.scheduler.minimum-allocation-mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.shuffle.port</name> @@ -248,8 +248,8 @@ ShuffleHandler is a service run at the NodeManager to facilitate transfers of intermediate Map outputs to requesting Reducers. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.jobhistory.intermediate-done-dir</name> @@ -257,8 +257,8 @@ <description> Directory where history files are written by MapReduce jobs. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.jobhistory.done-dir</name> @@ -267,24 +267,24 @@ Directory where history files are managed by the MR JobHistory Server. </description> <property-type>NOT_MANAGED_HDFS_PATH</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.jobhistory.address</name> <value>localhost:10020</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> <description>Enter your JobHistoryServer hostname.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.jobhistory.webapp.address</name> <value>localhost:19888</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> <description>Enter your JobHistoryServer hostname.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.framework.name</name> @@ -293,8 +293,8 @@ The runtime framework for executing MapReduce jobs. Can be one of local, classic or yarn. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.app.mapreduce.am.staging-dir</name> @@ -302,8 +302,8 @@ <description> The staging dir used while submitting jobs. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.app.mapreduce.am.resource.mb</name> @@ -327,8 +327,8 @@ <name>yarn.scheduler.minimum-allocation-mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.app.mapreduce.am.command-opts</name> @@ -353,8 +353,8 @@ <name>yarn.app.mapreduce.am.resource.mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.app.mapreduce.am.admin-command-opts</name> @@ -376,29 +376,29 @@ <name>yarn.app.mapreduce.am.resource.mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.app.mapreduce.am.log.level</name> <value>INFO</value> <description>MR App Master process log level.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.admin.map.child.java.opts</name> <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN</value> <description>This property stores Java options for map tasks.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.admin.reduce.child.java.opts</name> <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN</value> <description>This property stores Java options for reduce tasks.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.application.classpath</name> @@ -407,8 +407,8 @@ CLASSPATH for MR applications. A comma-separated list of CLASSPATH entries. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.am.max-attempts</name> @@ -419,8 +419,8 @@ set by resourcemanager. Otherwise, it will be override. The default number is set to 2, to allow at least one retry for AM. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.map.java.opts</name> @@ -435,8 +435,8 @@ <name>mapreduce.map.memory.mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.reduce.java.opts</name> @@ -451,8 +451,8 @@ <name>mapreduce.reduce.memory.mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.map.log.level</name> @@ -461,8 +461,8 @@ The logging level for the map task. The allowed levels are: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.reduce.log.level</name> @@ -471,8 +471,8 @@ The logging level for the reduce task. The allowed levels are: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.admin.user.env</name> @@ -482,8 +482,8 @@ This is not an additive property. You must preserve the original value if you want your map and reduce tasks to have access to native libraries (compression, etc) </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.output.fileoutputformat.compress</name> @@ -491,7 +491,7 @@ <description> Should the job outputs be compressed? </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml index f11a3ca..3962753 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml @@ -23,8 +23,8 @@ Maximum number of applications that can be pending and running. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.maximum-am-resource-percent</name> @@ -35,8 +35,8 @@ applications. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.queues</name> @@ -45,8 +45,8 @@ The queues at the this level (root is the root queue). </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.capacity</name> @@ -58,16 +58,16 @@ or less. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.default.capacity</name> <value>100</value> <description>Default queue target capacity.</description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.default.user-limit-factor</name> @@ -76,8 +76,8 @@ Default queue user limit a percentage from 0.0 to 1.0. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.default.maximum-capacity</name> @@ -86,8 +86,8 @@ The maximum capacity of the default queue. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.default.state</name> @@ -96,8 +96,8 @@ The state of the default queue. State can be one of RUNNING or STOPPED. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name> @@ -106,8 +106,8 @@ The ACL of who can submit jobs to the default queue. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.default.acl_administer_jobs</name> @@ -116,8 +116,8 @@ The ACL of who can administer jobs on the default queue. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.root.acl_administer_queue</name> @@ -127,8 +127,8 @@ allocations. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.node-locality-delay</name> @@ -140,8 +140,8 @@ approximately number of nodes in one rack which is 40. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.capacity.default.minimum-user-limit-percent</name> @@ -150,7 +150,7 @@ Default minimum queue resource limit depends on the number of users who have submitted applications. </description> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml index 648c32e..fb861f8 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml @@ -29,8 +29,8 @@ <type>directory</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn_pid_dir_prefix</name> @@ -42,8 +42,8 @@ <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn_user</name> @@ -55,8 +55,8 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn_heapsize</name> @@ -67,8 +67,8 @@ <type>int</type> <unit>MB</unit> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>resourcemanager_heapsize</name> @@ -80,8 +80,8 @@ <overridable>false</overridable> <unit>MB</unit> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>nodemanager_heapsize</name> @@ -92,8 +92,8 @@ <type>int</type> <unit>MB</unit> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>min_user_id</name> @@ -103,29 +103,29 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>is_supported_yarn_ranger</name> <value>false</value> <description>Set to false by default, needs to be set to true in stacks that use Ranger Yarn Plugin</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn_user_nofile_limit</name> <value>32768</value> <description>Max open files limit setting for YARN user.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn_user_nproc_limit</name> <value>65536</value> <description>Max number of processes limit setting for YARN user.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- yarn-env.sh --> <property> @@ -249,7 +249,7 @@ YARN_OPTS="$YARN_OPTS -Djava.io.tmpdir={{hadoop_java_io_tmpdir}}" <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml index 7fded04..a278ad3 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml @@ -89,7 +89,7 @@ log4j.appender.NMAUDIT.DatePattern=.yyyy-MM-dd <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <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/b7c95413/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml index 7d0791d..9355973 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml @@ -24,24 +24,24 @@ <value>localhost</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> <description>The hostname of the RM.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.resource-tracker.address</name> <value>localhost:8025</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> <description> The address of ResourceManager. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.scheduler.address</name> <value>localhost:8030</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> <description>The address of the scheduler interface.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.address</name> @@ -51,23 +51,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"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.admin.address</name> <value>localhost:8141</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> <description>The address of the RM admin interface.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.scheduler.class</name> <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value> <description>The class to use as the resource scheduler.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.minimum-allocation-mb</name> @@ -91,8 +91,8 @@ <name>yarn.nodemanager.resource.memory-mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.scheduler.maximum-allocation-mb</name> @@ -116,8 +116,8 @@ <name>yarn.nodemanager.resource.memory-mb</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.acl.enable</name> @@ -126,8 +126,8 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.admin.acl</name> @@ -136,16 +136,16 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- NodeManager --> <property> <name>yarn.nodemanager.address</name> <value>0.0.0.0:45454</value> <description>The address of the container manager in the NM.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.resource.memory-mb</name> @@ -160,15 +160,15 @@ <unit>MB</unit> <increment-step>256</increment-step> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.application.classpath</name> <value>/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*</value> <description>Classpath for typical applications.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.vmem-pmem-ratio</name> @@ -185,15 +185,15 @@ <maximum>5.0</maximum> <increment-step>0.1</increment-step> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.container-executor.class</name> <value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value> <description>ContainerExecutor for launching containers</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.group</name> @@ -205,23 +205,23 @@ <name>user_group</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.aux-services</name> <value>mapreduce_shuffle</value> <description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can not start with numbers</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name> <value>org.apache.hadoop.mapred.ShuffleHandler</value> <description>The auxiliary service class to use </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.log-dirs</name> @@ -236,8 +236,8 @@ <value-attributes> <type>directories</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.local-dirs</name> @@ -252,8 +252,8 @@ <value-attributes> <type>directories</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.container-monitor.interval-ms</name> @@ -262,8 +262,8 @@ The interval, in milliseconds, for which the node manager waits between two cycles of monitoring its containers' memory usage. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- <property> @@ -276,15 +276,15 @@ <name>yarn.nodemanager.health-checker.interval-ms</name> <value>135000</value> <description>Frequency of running node health script.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.health-checker.script.timeout-ms</name> <value>60000</value> <description>Script time out period.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.log.retain-second</name> @@ -293,8 +293,8 @@ Time in seconds to retain user logs. Only applicable if log aggregation is disabled. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.log-aggregation-enable</name> @@ -304,16 +304,16 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.remote-app-log-dir</name> <value>/app-logs</value> <description>Location to aggregate logs to. </description> <property-type>NOT_MANAGED_HDFS_PATH</property-type> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.remote-app-log-dir-suffix</name> @@ -322,8 +322,8 @@ The remote log dir will be created at {yarn.nodemanager.remote-app-log-dir}/${user}/{thisParam}. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.log-aggregation.compression-type</name> @@ -331,8 +331,8 @@ <description> T-file compression types used to compress aggregated logs. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.delete.debug-delay-sec</name> @@ -352,8 +352,8 @@ of the Yarn applications' log directories is configurable with the yarn.nodemanager.log-dirs property (see also below). </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.log-aggregation.retain-seconds</name> @@ -362,8 +362,8 @@ How long to keep aggregation logs before deleting them. -1 disables. Be careful set this too small and you will spam the name node. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.admin-env</name> @@ -372,8 +372,8 @@ Environment variables that should be forwarded from the NodeManager's environment to the container's. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.disk-health-checker.min-healthy-disks</name> @@ -385,8 +385,8 @@ If there are less number of healthy local-dirs (or log-dirs) available, then new containers will not be launched on this node. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.am.max-attempts</name> @@ -399,8 +399,8 @@ the resourcemanager will override it. The default number is set to 2, to allow at least one retry for AM. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.webapp.address</name> @@ -409,8 +409,8 @@ <description> The address of the RM web application. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.webapp.https.address</name> @@ -419,8 +419,8 @@ <description> The https address of the RM web application. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.vmem-check-enabled</name> @@ -428,8 +428,8 @@ <description> Whether virtual memory limits will be enforced for containers. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.log.server.url</name> @@ -438,8 +438,8 @@ <description> URI for the HistoryServer's log resource </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.resourcemanager.nodes.exclude-path</name> @@ -450,8 +450,8 @@ file must be specified. If the value is empty, no hosts are excluded. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.http.policy</name> @@ -459,7 +459,7 @@ <description> This configures the HTTP endpoint for Yarn Daemons.The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : Service is provided only on https </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml index 2a3b851..3e05fe9 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml @@ -22,8 +22,8 @@ <name>zeppelin.server.addr</name> <value>0.0.0.0</value> <description>Server address</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.server.port</name> @@ -31,15 +31,15 @@ <description>Server port.The subsequent port (e.g. 9996) should also be open as it will be used by the web socket </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.notebook.dir</name> <value>notebook</value> <description>notebook persist</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.notebook.homescreen</name> @@ -47,15 +47,15 @@ <description>id of notebook to be displayed in homescreen. e.g.) 2A94M5J1Z Empty value displays default home screen </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.notebook.homescreen.hide</name> <value>false</value> <description>hide homescreen notebook from list when this value set to true</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.notebook.s3.user</name> @@ -63,8 +63,8 @@ <description>user name for s3 folder structure. If S3 is used to store the notebooks, it is necessary to use the following folder structure bucketname/username/notebook/ </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.notebook.s3.bucket</name> @@ -72,8 +72,8 @@ <description>bucket name for notebook storage. If S3 is used to store the notebooks, it is necessary to use the following folder structure bucketname/username/notebook/ </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.notebook.storage</name> @@ -83,15 +83,15 @@ notebooks, it is necessary to use the following folder structure bucketname/username/notebook/ </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.interpreter.dir</name> <value>interpreter</value> <description>Interpreter implementation base directory</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.interpreters</name> @@ -99,66 +99,66 @@ <description>Comma separated interpreter configurations. First interpreter become a default </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.interpreter.connect.timeout</name> <value>30000</value> <description>Interpreter process connect timeout in msec.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl</name> <value>false</value> <description>Should SSL be used by the servers?</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl.client.auth</name> <value>false</value> <description>Should client authentication be used for SSL connections?</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl.keystore.path</name> <value>conf/keystore</value> <description>Path to keystore relative to Zeppelin home</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl.keystore.type</name> <value>JKS</value> <description>The format of the given keystore (e.g. JKS or PKCS12)</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl.keystore.password</name> <value>change me</value> <description>Keystore password. Can be obfuscated by the Jetty Password tool</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl.key.manager.password</name> <value>change me</value> <description>Key Manager password. Defaults to keystore password. Can be obfuscated. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl.truststore.path</name> <value>conf/truststore</value> <description>Path to truststore relative to Zeppelin home. Defaults to the keystore path </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl.truststore.type</name> @@ -166,8 +166,8 @@ <description>The format of the given truststore (e.g. JKS or PKCS12). Defaults to the same type as the keystore type </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.ssl.truststore.password</name> @@ -175,8 +175,8 @@ <description>Truststore password. Can be obfuscated by the Jetty Password tool. Defaults to the keystore password </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.server.allowed.origins</name> @@ -185,21 +185,21 @@ http://onehost:8080,http://otherhost.com). If you leave * you are vulnerable to https://issues.apache.org/jira/browse/ZEPPELIN-173 </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.anonymous.allowed</name> <value>true</value> <description>Anonymous user allowed by default</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.websocket.max.text.message.size</name> <value>1024000</value> <description>Size in characters of the maximum text message to be received by websocket. Defaults to 1024000</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index efd31f1..3adab02 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -21,31 +21,31 @@ <name>zeppelin_pid_dir</name> <value>/var/run/zeppelin-notebook</value> <description>Dir containing process ID file</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin_user</name> <value>zeppelin</value> <property-type>USER</property-type> <description>User zeppelin daemon runs as</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin_group</name> <value>zeppelin</value> <property-type>GROUP</property-type> <description>zeppelin group</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin_log_dir</name> <value>/var/log/zeppelin</value> <description>Zeppelin Log dir</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin_env_content</name> @@ -139,8 +139,8 @@ export SPARK_YARN_USER_ENV="PYTHONPATH=${PYTHONPATH}" # export ZEPPELIN_SPARK_MAXRESULT </value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>shiro_ini_content</name> @@ -174,8 +174,8 @@ shiro.loginUrl = /api/login /** = anon #/** = authc </value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>log4j_properties_content</name> @@ -192,22 +192,22 @@ log4j.appender.dailyfile.File = ${zeppelin.log.file} log4j.appender.dailyfile.layout = org.apache.log4j.PatternLayout log4j.appender.dailyfile.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m%n </value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.executor.mem</name> <value>512m</value> <description>Executor memory to use (e.g. 512m or 1g)</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.executor.instances</name> <value>2</value> <description>Number of executor instances to use (e.g. 2)</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>zeppelin.spark.jar.dir</name> @@ -215,7 +215,7 @@ log4j.appender.dailyfile.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m <description>Shared location where zeppelin spark jar will be copied to. Should be accesible by all cluster nodes </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration>