http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml index 4f39d21..cfb5c01 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration-mapred/mapred-site.xml @@ -32,6 +32,7 @@ By default, gives each merge stream 1MB, which should minimize seeks. </description> <display-name>Sort Allocation Memory</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -57,6 +58,7 @@ 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="true"/> </property> <property> @@ -66,6 +68,7 @@ The number of streams to merge at once while sorting files. This determines the number of open file handles. </description> + <on-ambari-upgrade add="true"/> </property> <!-- map/reduce properties --> @@ -75,6 +78,7 @@ <description> Administrators for MapReduce applications. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -84,6 +88,7 @@ The default number of parallel transfers run by reduce during the copy(shuffle) phase. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -93,6 +98,7 @@ If true, then multiple instances of some map tasks may be executed in parallel. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -102,6 +108,7 @@ If true, then multiple instances of some reduce tasks may be executed in parallel. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -111,6 +118,7 @@ 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="true"/> </property> <property> @@ -119,6 +127,7 @@ <description> Limit on the number of counters allowed per job. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -130,6 +139,7 @@ storing in-memory map outputs, as defined by mapreduce.reduce.shuffle.input.buffer.percent. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -139,6 +149,7 @@ The percentage of memory to be allocated from the maximum heap size to storing map outputs during the shuffle. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -148,6 +159,7 @@ 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="true"/> </property> <property> @@ -159,6 +171,7 @@ remaining map outputs in memory must consume less than this threshold before the reduce can begin. </description> + <on-ambari-upgrade add="true"/> </property> <!-- copied from kryptonite configuration --> @@ -168,6 +181,7 @@ <description> Should the outputs of the maps be compressed before being sent across the network. Uses SequenceFile compression. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -178,6 +192,7 @@ terminated if it neither reads an input, writes an output, nor updates its status string. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -185,6 +200,7 @@ <value>1024</value> <description>Virtual memory for single Map task</description> <display-name>Map Memory</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> @@ -209,6 +225,7 @@ <value>1024</value> <description>Virtual memory for single Reduce task</description> <display-name>Reduce Memory</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> @@ -236,6 +253,7 @@ ShuffleHandler is a service run at the NodeManager to facilitate transfers of intermediate Map outputs to requesting Reducers. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -244,6 +262,7 @@ <description> Directory where history files are written by MapReduce jobs. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -252,18 +271,21 @@ <description> Directory where history files are managed by the MR JobHistory Server. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>mapreduce.jobhistory.address</name> <value>localhost:10020</value> <description>Enter your JobHistoryServer hostname.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>mapreduce.jobhistory.webapp.address</name> <value>localhost:19888</value> <description>Enter your JobHistoryServer hostname.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -273,6 +295,7 @@ The runtime framework for executing MapReduce jobs. Can be one of local, classic or yarn. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -281,6 +304,7 @@ <description> The staging dir used while submitting jobs. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -288,6 +312,7 @@ <value>512</value> <description>The amount of memory the MR AppMaster needs.</description> <display-name>AppMaster Memory</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> @@ -324,6 +349,7 @@ mapreduce.reduce.env config settings. </description> <display-name>MR AppMaster Java Heap Size</display-name> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>mapred-site</type> @@ -346,6 +372,7 @@ mapreduce.reduce.env config settings. </description> <display-name>MR AppMaster Java Heap Size</display-name> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>mapred-site</type> @@ -358,18 +385,21 @@ <name>yarn.app.mapreduce.am.log.level</name> <value>INFO</value> <description>MR App Master process log level.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>mapreduce.admin.map.child.java.opts</name> <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN -Diop.version=${iop.version}</value> <description>This property stores Java options for map tasks.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>mapreduce.admin.reduce.child.java.opts</name> <value>-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN -Diop.version=${iop.version}</value> <description>This property stores Java options for reduce tasks.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -379,12 +409,14 @@ CLASSPATH for MR applications. A comma-separated list of CLASSPATH entries. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>mapreduce.application.framework.path</name> <value>/iop/apps/${iop.version}/mapreduce/mapreduce.tar.gz#mr-framework</value> <description></description> + <on-ambari-upgrade add="true"/> </property> @@ -397,6 +429,7 @@ 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="true"/> </property> @@ -408,6 +441,7 @@ Larger heap-size for child jvms of maps. </description> <display-name>MR Map Java Heap Size</display-name> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>mapred-site</type> @@ -424,6 +458,7 @@ Larger heap-size for child jvms of reduces. </description> <display-name>MR Reduce Java Heap Size</display-name> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>mapred-site</type> @@ -439,6 +474,7 @@ 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="true"/> </property> <property> @@ -448,6 +484,7 @@ 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="true"/> </property> <property> @@ -458,6 +495,7 @@ 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"/> </property> <property> @@ -466,6 +504,7 @@ <description> User added environment variables for the MR App Master processes. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -474,6 +513,7 @@ <description> Should the job outputs be compressed? </description> + <on-ambari-upgrade add="true"/> </property> </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml index 35404c6..513c8bd 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/capacity-scheduler.xml @@ -23,6 +23,7 @@ <description> Maximum number of applications that can be pending and running. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -33,6 +34,7 @@ application masters i.e. controls number of concurrent running applications. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -41,6 +43,7 @@ <description> The queues at the this level (root is the root queue). </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -52,12 +55,14 @@ The child queues capacity should add up to their parent queue's capacity or less. </description> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.scheduler.capacity.root.default.capacity</name> <value>100</value> <description>Default queue target capacity.</description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -66,6 +71,7 @@ <description> Default queue user limit a percentage from 0.0 to 1.0. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -74,6 +80,7 @@ <description> The maximum capacity of the default queue. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -82,6 +89,7 @@ <description> The state of the default queue. State can be one of RUNNING or STOPPED. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -90,6 +98,7 @@ <description> The ACL of who can submit jobs to the default queue. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -98,6 +107,7 @@ <description> The ACL of who can administer jobs on the default queue. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -107,6 +117,7 @@ The ACL for who can administer this queue i.e. change sub-queue allocations. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -118,6 +129,7 @@ Typically this should be set to number of nodes in the cluster, By default is setting approximately number of nodes in one rack which is 40. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -126,12 +138,14 @@ <description> Default minimum queue resource limit depends on the number of users who have submitted applications. </description> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.scheduler.capacity.resource-calculator</name> <value>org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator</value> <display-name>CPU Scheduling</display-name> + <on-ambari-upgrade add="false"/> <value-attributes> <type>value-list</type> <entries> @@ -152,6 +166,7 @@ <name>yarn.scheduler.capacity.root.accessible-node-labels</name> <value>*</value> <description></description> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml index 95372fb..956fa42 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-env.xml @@ -26,6 +26,7 @@ <display-name>YARN Log Dir Prefix</display-name> <value>/var/log/hadoop-yarn</value> <description>YARN Log Dir Prefix</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <overridable>false</overridable> @@ -37,6 +38,7 @@ <display-name>YARN PID Dir Prefix</display-name> <value>/var/run/hadoop-yarn</value> <description>YARN PID Dir Prefix</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <overridable>false</overridable> @@ -46,6 +48,7 @@ <property> <name>yarn_user</name> <value>yarn</value> + <on-ambari-upgrade add="true"/> <property-type>USER</property-type> <description>YARN User</description> </property> @@ -54,6 +57,7 @@ <display-name>YARN Java heap size</display-name> <value>1024</value> <description>Max heapsize for all YARN components using a numerical value in the scale of MB</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> @@ -64,6 +68,7 @@ <display-name>ResourceManager Java heap size</display-name> <value>1024</value> <description>Max heapsize for ResourceManager using a numerical value in the scale of MB</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <overridable>false</overridable> @@ -75,6 +80,7 @@ <display-name>NodeManager Java heap size</display-name> <value>1024</value> <description>Max heapsize for NodeManager using a numerical value in the scale of MB</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> @@ -85,6 +91,7 @@ <display-name>Minimum user ID for submitting job</display-name> <value>1000</value> <description>Set to 0 to disallow root from submitting jobs. Set to 1000 to disallow all superusers from submitting jobs</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> </value-attributes> @@ -94,6 +101,7 @@ <display-name>AppTimelineServer Java heap size</display-name> <value>1024</value> <description>Max heapsize for AppTimelineServer using a numerical value in the scale of MB</description> + <on-ambari-upgrade add="true"/> <value-attributes> <overridable>false</overridable> <unit>MB</unit> @@ -106,6 +114,7 @@ <value>false</value> <description>You can use CGroups to isolate CPU-heavy processes in a Hadoop cluster.</description> <display-name>CPU Isolation</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -238,6 +247,7 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then fi YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE" </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml index 8c44b9e..8e50a62 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-log4j.xml @@ -66,6 +66,7 @@ log4j.appender.JSA.layout=org.apache.log4j.PatternLayout log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=${yarn.server.resourcemanager.appsummary.logger} log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=false </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml index 397f96f..93ab51e 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/configuration/yarn-site.xml @@ -27,18 +27,21 @@ <name>yarn.resourcemanager.hostname</name> <value>localhost</value> <description>The hostname of the RM.</description> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.resource-tracker.address</name> <value>localhost:8025</value> <description> The address of ResourceManager. </description> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.scheduler.address</name> <value>localhost:8030</value> <description>The address of the scheduler interface.</description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -48,18 +51,21 @@ The address of the applications manager interface in the RM. </description> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.admin.address</name> <value>localhost:8141</value> <description>The address of the RM admin interface.</description> + <on-ambari-upgrade add="false"/> </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="true"/> </property> <property> @@ -71,6 +77,7 @@ and the specified value will get allocated at minimum. </description> <display-name>Minimum Container Size (Memory)</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -95,6 +102,7 @@ and will get capped to this value. </description> <display-name>Maximum Container Size (Memory)</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -114,6 +122,7 @@ <name>yarn.acl.enable</name> <value>false</value> <description> Are acls enabled. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -123,6 +132,7 @@ <name>yarn.admin.acl</name> <value></value> <description> ACL of who can be admin of the YARN cluster. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -134,6 +144,7 @@ <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="true"/> </property> <property> @@ -142,6 +153,7 @@ <description>Amount of physical memory, in MB, that can be allocated for containers.</description> <display-name>Memory allocated for all YARN containers on a node</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -155,6 +167,7 @@ <name>yarn.application.classpath</name> <value>/etc/hadoop/conf,/usr/iop/current/hadoop-client/*,/usr/iop/current/hadoop-client/lib/*,/usr/iop/current/hadoop-hdfs-client/*,/usr/iop/current/hadoop-hdfs-client/lib/*,/usr/iop/current/hadoop-yarn-client/*,/usr/iop/current/hadoop-yarn-client/lib/*</value> <description>Classpath for typical applications.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -166,6 +179,7 @@ is allowed to exceed this allocation by this ratio. </description> <display-name>Virtual Memory Ratio</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>float</type> <minimum>0.1</minimum> @@ -178,6 +192,7 @@ <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="true"/> <depends-on> <property> <type>yarn-env</type> @@ -190,6 +205,7 @@ <name>yarn.nodemanager.linux-container-executor.group</name> <value>hadoop</value> <description>Unix group of the NodeManager</description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>yarn-env</type> @@ -203,12 +219,14 @@ <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="true"/> </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="true"/> </property> <property> @@ -221,6 +239,7 @@ named container_{$contid}. Each container directory will contain the files stderr, stdin, and syslog generated by that container. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directories</type> </value-attributes> @@ -236,6 +255,7 @@ Individual containers' work directories, called container_${contid}, will be subdirectories of this. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directories</type> </value-attributes> @@ -248,6 +268,7 @@ The interval, in milliseconds, for which the node manager waits between two cycles of monitoring its containers' memory usage. </description> + <on-ambari-upgrade add="true"/> </property> <!-- @@ -255,6 +276,7 @@ <name>yarn.nodemanager.health-checker.script.path</name> <value>/etc/hadoop/conf/health_check_nodemanager</value> <description>The health check script to run.</description> + <on-ambari-upgrade add="true"/> </property> --> @@ -262,12 +284,14 @@ <name>yarn.nodemanager.health-checker.interval-ms</name> <value>135000</value> <description>Frequency of running node health script.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.nodemanager.health-checker.script.timeout-ms</name> <value>60000</value> <description>Script time out period.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -277,6 +301,7 @@ Time in seconds to retain user logs. Only applicable if log aggregation is disabled. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -284,6 +309,7 @@ <value>true</value> <description>Whether to enable log aggregation. </description> <display-name>Enable Log Aggregation</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -293,6 +319,7 @@ <name>yarn.nodemanager.remote-app-log-dir</name> <value>/app-logs</value> <description>Location to aggregate logs to. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> </value-attributes> @@ -305,6 +332,7 @@ The remote log dir will be created at {yarn.nodemanager.remote-app-log-dir}/${user}/{thisParam}. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -313,6 +341,7 @@ <description> T-file compression types used to compress aggregated logs. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -333,6 +362,7 @@ of the Yarn applications' log directories is configurable with the yarn.nodemanager.log-dirs property (see also below). </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -342,6 +372,7 @@ 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="true"/> </property> <property> @@ -351,6 +382,7 @@ Environment variables that should be forwarded from the NodeManager's environment to the container's. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -363,6 +395,7 @@ 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="true"/> </property> <property> @@ -376,6 +409,7 @@ 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="true"/> </property> <property> @@ -384,6 +418,7 @@ <description> The address of the RM web application. </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -392,6 +427,7 @@ <description> Whether virtual memory limits will be enforced for containers. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -400,6 +436,7 @@ <description> URI for the HistoryServer's log resource </description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -411,6 +448,7 @@ file must be specified. If the value is empty, no hosts are excluded. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -419,6 +457,7 @@ <description>Indicate to clients whether timeline service is enabled or not. If enabled, clients will put entities and events to the timeline server. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -431,6 +470,7 @@ <description> Store class name for timeline store </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -439,6 +479,7 @@ <description> Store class name for history store, defaulting to file system store </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -447,6 +488,7 @@ <description> Store file name for leveldb timeline store </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> </value-attributes> @@ -458,6 +500,7 @@ <description> The http address of the timeline service web application. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -466,6 +509,7 @@ <description> The http address of the timeline service web application. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -475,11 +519,13 @@ This is default address for the timeline server to start the RPC server. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.timeline-service.ttl-enable</name> <description>Enable age off of timeline store data.</description> <value>true</value> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -488,6 +534,7 @@ <description>Time to live for timeline store data in milliseconds.</description> <name>yarn.timeline-service.ttl-ms</name> <value>2678400000</value> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> </value-attributes> @@ -496,6 +543,7 @@ <description>Length of time to wait between deletion cycles of leveldb timeline store in milliseconds.</description> <name>yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms</name> <value>300000</value> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> </value-attributes> @@ -508,6 +556,7 @@ <name>yarn.nodemanager.recovery.enabled</name> <value>false</value> <description>Enable the node manager to recover after starting</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.resourcemanager.recovery.enabled</name> @@ -516,6 +565,7 @@ Enable RM to recover state after starting. If true, then yarn.resourcemanager.store.class must be specified. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.resourcemanager.work-preserving-recovery.enabled</name> @@ -523,6 +573,7 @@ <description> Enable RM work preserving recovery. This configuration is private to YARN for experimenting the feature. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.resourcemanager.zk-address</name> @@ -530,21 +581,25 @@ <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"/> </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"/> </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"/> </property> <property> <name>yarn.resourcemanager.ha.enabled</name> <value>false</value> <description>enable RM HA or not</description> + <on-ambari-upgrade add="true"/> </property> <!-- Isolation --> @@ -552,21 +607,25 @@ <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"/> </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"/> </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"/> </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"/> </property> <!-- Scheduler --> @@ -575,6 +634,7 @@ <value>8</value> <description></description> <display-name>Number of virtual cores</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -593,6 +653,7 @@ <value>80</value> <description>The amount of CPU allocated for YARN containers - only effective when used with CGroups</description> <display-name>Percentage of physical CPU allocated for all containers on a node</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -608,11 +669,13 @@ Defines authentication used for the Timeline Server HTTP endpoint. Supported values are: simple | kerberos | $AUTHENTICATION_HANDLER_CLASSNAME </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.timeline-service.http-authentication.simple.anonymous.allowed</name> <value>true</value> <description></description> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.resourcemanager.webapp.delegation-token-auth-filter.enabled</name> @@ -623,34 +686,41 @@ tokens(fallback to kerberos if the tokens are missing). Only applicable when the http authentication type is kerberos. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.timeline-service.bind-host</name> <value>0.0.0.0</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.nodemanager.bind-host</name> <value>0.0.0.0</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.resourcemanager.bind-host</name> <value>0.0.0.0</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.resourcemanager.system-metrics-publisher.enabled</name> <value>true</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>hadoop.registry.rm.enabled</name> <value>false</value> <description> Is the registry enabled: does the RM start it up, create the user and system paths, and purge service records when </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hadoop.registry.zk.quorum</name> <value>localhost:2181</value> <description> List of hostname:port pairs defining the zookeeper quorum binding for the registry </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -660,9 +730,7 @@ Enable node labels to restrict YARN applications so that they run only on cluster nodes that have a specified node label. </description> <display-name>Node Labels</display-name> - <value-attributes> - <type>boolean</type> - </value-attributes> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -683,6 +751,7 @@ <name>yarn.resourcemanager.scheduler.monitor.enable</name> <value>false</value> <display-name>Pre-emption</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -704,6 +773,7 @@ <value>1</value> <description></description> <display-name>Minimum Container Size (VCores)</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -723,6 +793,7 @@ <value>8</value> <description></description> <display-name>Maximum Container Size (VCores)</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -743,6 +814,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="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml index 275cc6a..18793ae 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zoo.cfg.xml @@ -26,6 +26,7 @@ <display-name>Length of single Tick</display-name> <value>2000</value> <description>The length of a single tick in milliseconds, which is the basic time unit used by ZooKeeper</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <overridable>false</overridable> @@ -37,6 +38,7 @@ <display-name>Ticks to allow for sync at Init</display-name> <value>10</value> <description>Ticks to allow for sync at Init.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <overridable>false</overridable> @@ -47,6 +49,7 @@ <display-name>Ticks to allow for sync at Runtime</display-name> <value>5</value> <description>Ticks to allow for sync at Runtime.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <overridable>false</overridable> @@ -57,6 +60,7 @@ <display-name>Port for running ZK Server</display-name> <value>2181</value> <description>Port for running ZK Server.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <overridable>false</overridable> @@ -67,6 +71,7 @@ <display-name>ZooKeeper directory</display-name> <value>/hadoop/zookeeper</value> <description>Data directory for ZooKeeper.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> </value-attributes> @@ -75,10 +80,12 @@ <name>autopurge.snapRetainCount</name> <value>30</value> <description>ZooKeeper purge feature retains the autopurge.snapRetainCount most recent snapshots and the corresponding transaction logs in the dataDir and dataLogDir respectively and deletes the rest. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>autopurge.purgeInterval</name> <value>24</value> <description>The time interval in hours for which the purge task has to be triggered. Set to a positive integer (1 and above) to enable the auto purging.</description> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml index b57992e..b5dca83 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-env.xml @@ -24,6 +24,7 @@ <property> <name>zk_user</name> <value>zookeeper</value> + <on-ambari-upgrade add="true"/> <property-type>USER</property-type> <description>ZooKeeper User.</description> </property> @@ -32,6 +33,7 @@ <display-name>ZooKeeper Log Dir</display-name> <value>/var/log/zookeeper</value> <description>ZooKeeper Log Dir</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <editable-only-at-install>true</editable-only-at-install> @@ -43,6 +45,7 @@ <display-name>ZooKeeper PID Dir</display-name> <value>/var/run/zookeeper</value> <description>ZooKeeper Pid Dir</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <editable-only-at-install>true</editable-only-at-install> @@ -69,5 +72,6 @@ export SERVER_JVMFLAGS="$SERVER_JVMFLAGS -Djava.security.auth.login.config={{zk_ export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_client_jaas_file}}" {% endif %} </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml index 6fcf5bc..3ac037a 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/ZOOKEEPER/configuration/zookeeper-log4j.xml @@ -96,6 +96,7 @@ log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout ### Notice we are including log4j's NDC here (%x) log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml index 3747825..001f498 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/FLUME/configuration/flume-env.xml @@ -25,6 +25,7 @@ <name>flume_run_dir</name> <value>/var/run/flume</value> <description>Location to save information about running agents</description> + <on-ambari-upgrade add="true"/> </property> <!-- flume-env.sh --> @@ -66,5 +67,6 @@ fi export HIVE_HOME={{flume_hive_home}} export HCAT_HOME={{flume_hcat_home}} </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml index d92e473..612c4f3 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hadoop-env.xml @@ -152,12 +152,14 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/iop/current/hadoop-client/lib #Hadoop logging options. Modify and uncomment to change logging level #export HADOOP_ROOT_LOGGER={{hadoop_root_logger}} </value> + <on-ambari-upgrade add="true"/> </property> <property> <name>nfsgateway_heapsize</name> <display-name>NFSGateway maximum Java heap size</display-name> <value>1024</value> <description>Maximum Java heap size for NFSGateway (Java option -Xmx)</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml index 1a40673..434cbb8 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HDFS/configuration/hdfs-site.xml @@ -32,6 +32,7 @@ they are accumulated to exceed certain threshold (e.g., 1MB) in memory. One needs to make sure the directory has enough space. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> </value-attributes> @@ -41,6 +42,7 @@ <name>nfs.exports.allowed.hosts</name> <value>* rw</value> <display-name>Allowed hosts</display-name> + <on-ambari-upgrade add="true"/> </property> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml index 2014c78..25d3e1d 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-env.xml @@ -81,12 +81,14 @@ ${HIVE_AUX_JARS_PATH} export METASTORE_PORT={{hive_metastore_port}} </value> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive_security_authorization</name> <display-name>Choose Authorization</display-name> <value>None</value> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -106,6 +108,7 @@ export METASTORE_PORT={{hive_metastore_port}} <name>hive_exec_orc_storage_strategy</name> <display-name>ORC Storage Strategy</display-name> <value>SPEED</value> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -126,6 +129,7 @@ export METASTORE_PORT={{hive_metastore_port}} <name>hive_txn_acid</name> <display-name>ACID Transactions</display-name> <value>off</value> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -147,6 +151,7 @@ export METASTORE_PORT={{hive_metastore_port}} <value>1024</value> <description>Hive Java heap size</description> <display-name>HiveServer2 Heap Size</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> @@ -162,6 +167,7 @@ export METASTORE_PORT={{hive_metastore_port}} <value>512</value> <description>Hive Client Java heap size</description> <display-name>Client Heap Size</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> @@ -177,6 +183,7 @@ export METASTORE_PORT={{hive_metastore_port}} <value>1024</value> <description>Hive Metastore Java heap size</description> <display-name>Metastore Heap Size</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml index e1a2114..4046051 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/HIVE/configuration/hive-site.xml @@ -23,6 +23,7 @@ limitations under the License. <name>hive.security.authenticator.manager</name> <value>org.apache.hadoop.hive.ql.security.ProxyUserAuthenticator</value> <description>Hive client authenticator manager class name. The user-defined authenticator class should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -30,6 +31,7 @@ limitations under the License. <value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</value> <description>the hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -40,6 +42,7 @@ limitations under the License. Hive operations as the user making the calls to it. </description> <display-name>Run as end user instead of Hive user</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -61,12 +64,13 @@ limitations under the License. <value>256000000</value> <description>size per reducer.The default is 256Mb, i.e if the input size is 1G, it will use 4 reducers.</description> <display-name>Data per Reducer</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>64</minimum> <maximum>4294967296</maximum> <unit>B</unit> - <step-increment></step-increment> + <increment-step></increment-step> </value-attributes> </property> <property> @@ -78,6 +82,7 @@ limitations under the License. org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider. </description> <display-name>Hive Authorization Manager</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>string</type> </value-attributes> @@ -90,6 +95,7 @@ limitations under the License. converted to a mapjoin(there is no conditional task). The default is 10MB. </description> <display-name>For Map Join, per Map memory threshold</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>1073741824</minimum> @@ -107,6 +113,7 @@ limitations under the License. when it is brought up. JDBC/ODBC clients should use the ZooKeeper ensemble: hive.zookeeper.quorum in their connection string. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -116,6 +123,7 @@ limitations under the License. <name>hive.vectorized.groupby.checkinterval</name> <value>100000</value> <description>Number of entries added to the group by aggregation hash before a recomputation of average entry size is performed.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -123,6 +131,7 @@ limitations under the License. <value>true</value> <description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description> <display-name>Enable Cost Based Optimizer</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -143,6 +152,7 @@ limitations under the License. <value>67108864</value> <description>Define the default ORC stripe size</description> <display-name>Default ORC Stripe Size</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>8388608</minimum> @@ -156,6 +166,7 @@ limitations under the License. <value>ZLIB</value> <description>Define the default compression codec for ORC file</description> <display-name>ORC Compression Algorithm</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -181,6 +192,7 @@ limitations under the License. of column statistics from metastore. </description> <display-name>Fetch column stats at compiler</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -207,6 +219,7 @@ limitations under the License. <description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description> <value>NONE</value> <display-name>HiveServer2 Authentication</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -239,6 +252,7 @@ limitations under the License. <value>false</value> <description/> <display-name>Use SSL</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -261,6 +275,7 @@ limitations under the License. Chooses execution engine. Option is: mr (Map reduce, default) </description> <display-name>hive.execution.engine</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -277,6 +292,7 @@ limitations under the License. <value>false</value> <description>Whether to run the compactor's initiator thread in this metastore instance or not. If there is more than one instance of the thrift metastore this should only be set to true for one of them.</description> <display-name>Run Compactor</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -303,6 +319,7 @@ limitations under the License. <value>0</value> <description>Number of compactor worker threads to run on this metastore instance. Can be different values on different metastore instances.</description> <display-name>Number of threads used by Compactor</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -321,6 +338,7 @@ limitations under the License. <value>TextFile</value> <description>Default file format for CREATE TABLE statement.</description> <display-name>Default File Format</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml index ff82a35..a3c3d6b 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/OOZIE/configuration/oozie-site.xml @@ -60,5 +60,6 @@ limitations under the License. All services to be created and managed by Oozie Services singleton. Class names must be separated by commas. </description> + <on-ambari-upgrade add="true"/> </property> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml index bd5a911..606fa9d 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration-mapred/mapred-site.xml @@ -29,6 +29,7 @@ server state upon startup. If enabled then mapreduce.jobhistory.recovery.store.class must be specified. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -37,6 +38,7 @@ <description>The HistoryServerStateStoreService class to store history server state for recovery. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -45,6 +47,7 @@ <description>The URI where history server state will be stored if HistoryServerLeveldbSystemStateStoreService is configured as the recovery storage class. </description> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml index 12a8a21..236de2a 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.1/services/YARN/configuration/yarn-site.xml @@ -24,20 +24,23 @@ <property> <name>yarn.node-labels.manager-class</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.timeline-service.recovery.enabled</name> <value>true</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.admin.acl</name> <value>yarn</value> <description> ACL of who can be admin of the YARN cluster. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> </property> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml index 047d3f6..b824ce2 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HBASE/configuration/hbase-site.xml @@ -273,6 +273,7 @@ <property> <name>hbase.table.sanity.checks</name> <value>true</value> + <on-ambari-upgrade add="true"/> </property> <property> @@ -379,10 +380,12 @@ <property> <name>hbase.rest.authentication.type</name> <value>simple</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase.rest.port</name> <value>8091</value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml index 39a1060..f5a986b 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HDFS/configuration/hdfs-site.xml @@ -22,6 +22,7 @@ <property> <name>dfs.namenode.acls.enabled</name> <value>true</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.namenode.audit.log.async</name> @@ -139,6 +140,7 @@ The default value is 1 hour. Setting a value of 0 disables access times for HDFS. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml index c04c5a1..799a3b3 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/hive-site.xml @@ -34,7 +34,6 @@ limitations under the License. <description>Database name used as the Hive Metastore</description> <value-attributes> <type>database</type> - <type>host</type> <overridable>false</overridable> </value-attributes> <on-ambari-upgrade add="true"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml index 49d813e..7bedc63 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/configuration/ranger-hive-audit.xml @@ -30,6 +30,7 @@ <value>false</value> <display-name>Audit to DB</display-name> <description>Is Audit to DB enabled?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -45,17 +46,20 @@ <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> <description>Audit DB JDBC URL</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> <description>Audit DB JDBC User</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Audit DB JDBC Password</description> </property> @@ -64,18 +68,21 @@ <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> <description>Audit DB JDBC Driver</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> <description>Credential file store</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/hive/audit/db/spool</value> <description>/var/log/hive/audit/db/spool</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -83,6 +90,7 @@ <value>true</value> <display-name>Audit to HDFS</display-name> <description>Is Audit to HDFS enabled?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml index e29dca9..307b009 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/gateway-site.xml @@ -24,5 +24,6 @@ limitations under the License. <name>gateway.websocket.feature.enabled</name> <value>true</value> <description>Enable/Disable websocket feature.</description> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml index b0a7baf..e2cc3e0 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/knox-env.xml @@ -25,6 +25,7 @@ <display-name>Knox Logs dir</display-name> <value>/var/log/knox</value> <description>Knox Log dir.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <editable-only-at-install>true</editable-only-at-install> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml index 9cbbab1..a8d742c 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/KNOX/configuration/topology.xml @@ -200,6 +200,7 @@ <description> The configuration specifies the Hadoop cluster services Knox will provide access to. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> <show-property-name>false</show-property-name> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml index b6a14a2..f8d50fc 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SPARK2/configuration/spark2-javaopts-properties.xml @@ -23,6 +23,7 @@ <name>content</name> <description>Spark2-javaopts-properties</description> <value> </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml index d5d281f..7b4303e 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration-mapred/mapred-site.xml @@ -134,5 +134,6 @@ <description> User added environment variables for the MR App Master processes. </description> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml index 39a9e06..9dcb52e 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/YARN/configuration/yarn-site.xml @@ -737,6 +737,7 @@ is allowed to exceed this allocation by this ratio. </description> <display-name>Virtual Memory Ratio</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>float</type> <minimum>0.1</minimum> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml index 1861ebd..45f9880 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-env.xml @@ -23,6 +23,7 @@ <name>ambari_metrics_user</name> <display-name>Ambari Metrics User</display-name> <value>ams</value> + <on-ambari-upgrade add="true"/> <property-type>USER</property-type> <description>Ambari Metrics User Name.</description> </property> @@ -31,29 +32,34 @@ <value>/var/log/ambari-metrics-collector</value> <display-name>Metrics Collector log dir</display-name> <description>Collector log directory.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_collector_pid_dir</name> <value>/var/run/ambari-metrics-collector</value> <display-name>Metrics Collector pid dir</display-name> <description>Collector pid directory.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_monitor_pid_dir</name> <value>/var/run/ambari-metrics-monitor</value> <display-name>Metrics Monitor pid dir</display-name> <description>Monitor pid directory.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_monitor_log_dir</name> <value>/var/log/ambari-metrics-monitor</value> <display-name>Metrics Monitor log dir</display-name> <description>Monitor log directory.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>metrics_collector_heapsize</name> <value>512</value> <description>Metrics Collector Heap Size</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> @@ -102,6 +108,7 @@ export AMS_COLLECTOR_GC_OPTS="-XX:+UseConcMarkSweepGC -verbose:gc -XX:+PrintGCDe export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS" </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml index 743822d..00d396c 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-env.xml @@ -25,16 +25,19 @@ <name>hbase_log_dir</name> <value>/var/log/ambari-metrics-collector</value> <description>Log Directories for HBase.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_pid_dir</name> <value>/var/run/ambari-metrics-collector/</value> <description>Pid Directory for HBase.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_classpath_additional</name> <value></value> <description>Additional directory or jar in classpath for HBase.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -46,6 +49,7 @@ HBase RegionServer Heap Size. In embedded mode, total heap size is sum of master and regionserver heap sizes. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> @@ -65,6 +69,7 @@ <name>regionserver_xmn_size</name> <value>256</value> <description>HBase RegionServer maximum value for young generation heap size.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> @@ -82,6 +87,7 @@ <description> HBase Master maximum value for young generation heap size. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> @@ -97,6 +103,7 @@ <name>hbase_master_maxperm_size</name> <value>128</value> <description>HBase RegionServer maximum value for perm heap size.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> @@ -106,6 +113,7 @@ <name>hbase_regionserver_xmn_ratio</name> <value>0.2</value> <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hbase_master_heapsize</name> @@ -114,6 +122,7 @@ HBase Master Heap Size. In embedded mode, total heap size is sum of master and regionserver heap sizes. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>MB</unit> @@ -135,6 +144,7 @@ <description> The maximum number of open file descriptors by process </description> + <on-ambari-upgrade add="true"/> </property> <!-- hbase-env.sh --> @@ -229,6 +239,7 @@ export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}" # Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs export HADOOP_HOME={{ams_hbase_home_dir}} </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml index 44fc7c6..4eea14f 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-log4j.xml @@ -138,6 +138,7 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO # log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO </value> + <on-ambari-upgrade add="true"/> <value-attributes> <show-property-name>false</show-property-name> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml index 55ccab8..13726a2 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-policy.xml @@ -29,6 +29,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -39,6 +40,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -49,5 +51,6 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed.</description> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml index 607fbda..64799c1 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/configuration/ams-hbase-security-site.xml @@ -23,6 +23,7 @@ <property> <name>ams.zookeeper.keytab</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -30,6 +31,7 @@ <property> <name>ams.zookeeper.principal</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -37,6 +39,7 @@ <property> <name>hadoop.security.authentication</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -44,6 +47,7 @@ <property> <name>hbase.coprocessor.master.classes</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -51,6 +55,7 @@ <property> <name>hbase.coprocessor.region.classes</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -58,6 +63,7 @@ <property> <name>hbase.master.kerberos.principal</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -65,6 +71,7 @@ <property> <name>hbase.master.keytab.file</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -72,6 +79,7 @@ <property> <name>hbase.myclient.keytab</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -79,6 +87,7 @@ <property> <name>hbase.myclient.principal</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -86,6 +95,7 @@ <property> <name>hbase.regionserver.kerberos.principal</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -93,6 +103,7 @@ <property> <name>hbase.regionserver.keytab.file</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -100,6 +111,7 @@ <property> <name>hbase.security.authentication</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -107,6 +119,7 @@ <property> <name>hbase.security.authorization</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -114,6 +127,7 @@ <property> <name>hbase.zookeeper.property.authProvider.1</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -121,6 +135,7 @@ <property> <name>hbase.zookeeper.property.jaasLoginRenew</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -128,6 +143,7 @@ <property> <name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -135,6 +151,7 @@ <property> <name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -142,6 +159,7 @@ <property> <name>zookeeper.znode.parent</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes>
