http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/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 591cc72..efd31f1 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 @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,35 +16,37 @@ See the License for the specific language governing permissions and limitations under the License. --> - <configuration> - - <property> + <property> <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"/> </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"/> </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"/> </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"/> </property> - <property> <name>zeppelin_env_content</name> <description>This is the jinja template for zeppelin-env.sh file</description> @@ -138,8 +139,9 @@ 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"/> </property> - <property> <name>shiro_ini_content</name> <description>This is the jinja template for shiro.ini file</description> @@ -172,12 +174,13 @@ 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"/> </property> - <property> - <name>log4j_properties_content</name> - <description>This is the content for log4j.properties file</description> - <value> + <name>log4j_properties_content</name> + <description>This is the content for log4j.properties file</description> + <value> log4j.rootLogger = INFO, dailyfile log4j.appender.stdout = org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout = org.apache.log4j.PatternLayout @@ -189,26 +192,30 @@ 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"/> </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"/> </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"/> </property> - <property> <name>zeppelin.spark.jar.dir</name> <value>/apps/zeppelin</value> <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"/> </property> - </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml index c3ba734..81d03e9 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration> <property> <name>tickTime</name> @@ -31,6 +30,8 @@ <overridable>false</overridable> <unit>ms</unit> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>initLimit</name> @@ -41,6 +42,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>syncLimit</name> @@ -51,6 +54,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>clientPort</name> @@ -61,6 +66,8 @@ <type>int</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>dataDir</name> @@ -70,6 +77,8 @@ <value-attributes> <type>directory</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>autopurge.snapRetainCount</name> @@ -77,11 +86,15 @@ <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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml index 676638e..281a2a9 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <property> <name>zk_user</name> @@ -31,6 +30,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"/> </property> <property> <name>zk_log_dir</name> @@ -41,6 +42,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"/> </property> <property> <name>zk_pid_dir</name> @@ -52,6 +55,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"/> </property> <property> <name>zk_server_heapsize</name> @@ -65,18 +70,21 @@ <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"/> </property> <property> <name>zookeeper_principal_name</name> <description>ZooKeeper principal name</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>zookeeper_keytab_path</name> <description>ZooKeeper keytab path</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <!-- zookeeper-env.sh --> <property> <name>content</name> @@ -99,5 +107,7 @@ export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_ <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml index 49e2b14..e32a021 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-log4j.xml @@ -19,9 +19,7 @@ * limitations under the License. */ --> - <configuration supports_final="false" supports_adding_forbidden="true"> - <property> <name>content</name> <display-name>zookeeper-log4j template</display-name> @@ -101,6 +99,7 @@ log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@% <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"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/configuration-schema.xsd ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/configuration-schema.xsd b/ambari-server/src/main/resources/configuration-schema.xsd new file mode 100644 index 0000000..d49cbf8 --- /dev/null +++ b/ambari-server/src/main/resources/configuration-schema.xsd @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:element name="configuration"> + <xs:complexType> + <xs:sequence> + <xs:element name="property" type="property" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="supports_final" type="xs:boolean" use="optional"/> + <xs:attribute name="supports_deletable" type="xs:boolean" use="optional"/> + <xs:attribute name="supports_adding_forbidden" type="xs:boolean" use="optional"/> + <xs:attribute name="supports_do_not_extend" type="xs:boolean" use="optional"/> + </xs:complexType> + </xs:element> + + <xs:complexType name="property"> + <xs:all> + <xs:element name="name" type="xs:string" minOccurs="1"/> + <xs:element name="value" type="xs:string" minOccurs="0"/> + <xs:element name="description" type="xs:string" minOccurs="0"/> + <xs:element name="display-name" type="xs:string" minOccurs="0"/> + <xs:element name="filename" type="xs:string" minOccurs="0"/> + <xs:element name="deleted" type="xs:boolean" minOccurs="0"/> + <xs:element name="final" type="xs:boolean" minOccurs="0"/> + <xs:element name="on-ambari-upgrade" type="propertyUpgradeBehavior" minOccurs="1"/> + <xs:element name="on-stack-upgrade" type="propertyUpgradeBehavior" minOccurs="1"/> + <xs:element name="property-type" minOccurs="0"> + <xs:simpleType> + <xs:list itemType="propertyType"/> + </xs:simpleType> + </xs:element> + <xs:element name="value-attributes" type="valueAttributesInfo" minOccurs="0"/> + <xs:element name="depends-on" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="property" type="propertyDependencyInfo" minOccurs="1" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="property_depended_by" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="dependedByProperties" type="propertyDependencyInfo" nillable="true" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:all> + <xs:attribute name="require-input" type="xs:boolean" use="optional"/> + </xs:complexType> + + <xs:complexType name="propertyUpgradeBehavior"> + <xs:attribute name="add" type="xs:boolean" use="required"/> + <xs:attribute name="delete" type="xs:boolean" use="required"/> + <xs:attribute name="change" type="xs:boolean" use="required"/> + </xs:complexType> + + <xs:complexType name="valueAttributesInfo"> + <xs:all> + <xs:element name="type" type="xs:string" minOccurs="0"/> + <xs:element name="maximum" type="xs:string" minOccurs="0"/> + <xs:element name="minimum" type="xs:string" minOccurs="0"/> + <xs:element name="unit" type="xs:string" minOccurs="0"/> + <xs:element name="delete" type="xs:string" minOccurs="0"/> + <xs:element name="visible" type="xs:boolean" minOccurs="0"/> + <xs:element name="overridable" type="xs:boolean" minOccurs="0"/> + <xs:element name="empty-value-valid" type="xs:boolean" minOccurs="0"/> + <xs:element name="ui-only-property" type="xs:boolean" minOccurs="0"/> + <xs:element name="read-only" type="xs:boolean" minOccurs="0"/> + <xs:element name="editable-only-at-install" type="xs:boolean" minOccurs="0"/> + <xs:element name="show-property-name" type="xs:boolean" minOccurs="0"/> + <xs:element name="increment-step" type="xs:string" minOccurs="0"/> + <xs:element name="entries" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="entry" type="valueEntryInfo" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="entries_editable" type="xs:boolean" minOccurs="0"/> + <xs:element name="selection-cardinality" type="xs:string" minOccurs="0"/> + <xs:element name="property-file-name" type="xs:string" minOccurs="0"/> + <xs:element name="property-file-type" type="xs:string" minOccurs="0"/> + </xs:all> + </xs:complexType> + + <xs:complexType name="valueEntryInfo"> + <xs:all> + <xs:element name="value" type="xs:string" minOccurs="0"/> + <xs:element name="label" type="xs:string" minOccurs="0"/> + <xs:element name="description" type="xs:string" minOccurs="0"/> + </xs:all> + </xs:complexType> + + <xs:complexType name="propertyDependencyInfo"> + <xs:sequence> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="name" type="xs:string" minOccurs="0"/> + <xs:element name="type" type="xs:string" minOccurs="0"/> + </xs:choice> + </xs:sequence> + </xs:complexType> + + <xs:simpleType name="propertyType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="PASSWORD"/> + <xs:enumeration value="USER"/> + <xs:enumeration value="GROUP"/> + <xs:enumeration value="TEXT"/> + <xs:enumeration value="ADDITIONAL_USER_PROPERTY"/> + <xs:enumeration value="NOT_MANAGED_HDFS_PATH"/> + <xs:enumeration value="VALUE_FROM_PROPERTY_FILE"/> + <xs:enumeration value="DONT_ADD_ON_UPGRADE"/> + </xs:restriction> + </xs:simpleType> +</xs:schema> + http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh b/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh new file mode 100644 index 0000000..930f778 --- /dev/null +++ b/ambari-server/src/main/resources/scripts/configurations-set-default-update-policy.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + + +for i in `find ../../../ -regex '.*/configuration.*/.*.xml'` ; +do + echo $i; + + xmlstarlet ed --inplace -d "//on-ambari-upgrade" $i + xmlstarlet ed --inplace -d "//on-stack-upgrade" $i + + `xmlstarlet ed --inplace --subnode "/configuration/property" -t 'elem' -n "on-ambari-upgrade" $i`; + `xmlstarlet ed --inplace --subnode "/configuration/property/on-ambari-upgrade" -t 'attr' -n "add" -v "false" $i`; + `xmlstarlet ed --inplace --subnode "/configuration/property/on-ambari-upgrade" -t 'attr' -n "change" -v "true" $i`; + `xmlstarlet ed --inplace --subnode "/configuration/property/on-ambari-upgrade" -t 'attr' -n "delete" -v "true" $i`; + + `xmlstarlet ed --inplace --subnode "/configuration/property" -t 'elem' -n "on-stack-upgrade" $i`; + `xmlstarlet ed --inplace --subnode "/configuration/property/on-stack-upgrade" -t 'attr' -n "add" -v "true" $i`; + `xmlstarlet ed --inplace --subnode "/configuration/property/on-stack-upgrade" -t 'attr' -n "change" -v "true" $i`; + `xmlstarlet ed --inplace --subnode "/configuration/property/on-stack-upgrade" -t 'attr' -n "delete" -v "false" $i`; +done http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml index c8f5148..bcc2a97 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml @@ -19,51 +19,62 @@ * limitations under the License. */ --> - <configuration> - <property> - <name>security_enabled</name> - <value>false</value> - <description>Hadoop Security</description> - </property> - <property> - <name>kerberos_domain</name> - <value>EXAMPLE.COM</value> - <description>Kerberos realm.</description> - </property> - <property> - <name>ignore_groupsusers_create</name> - <value>false</value> - <description>Whether to ignore failures on users and group creation</description> - <value-attributes> - <type>boolean</type> - </value-attributes> - </property> - <property> - <name>smokeuser</name> - <display-name>Smoke User</display-name> - <value>ambari-qa</value> - <property-type>USER</property-type> - <description>User executing service checks</description> - <value-attributes> - <type>user</type> - <overridable>false</overridable> - </value-attributes> - </property> - <property> - <name>smokeuser_keytab</name> - <value>/etc/security/keytabs/smokeuser.headless.keytab</value> - <description>Path to smoke test user keytab file</description> - </property> - <property> - <name>user_group</name> - <display-name>Hadoop Group</display-name> - <value>hadoop</value> - <property-type>GROUP</property-type> - <description>Hadoop user group.</description> - <value-attributes> - <type>user</type> - <overridable>false</overridable> - </value-attributes> - </property> + <property> + <name>security_enabled</name> + <value>false</value> + <description>Hadoop Security</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>kerberos_domain</name> + <value>EXAMPLE.COM</value> + <description>Kerberos realm.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>ignore_groupsusers_create</name> + <value>false</value> + <description>Whether to ignore failures on users and group creation</description> + <value-attributes> + <type>boolean</type> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>smokeuser</name> + <display-name>Smoke User</display-name> + <value>ambari-qa</value> + <property-type>USER</property-type> + <description>User executing service checks</description> + <value-attributes> + <type>user</type> + <overridable>false</overridable> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>smokeuser_keytab</name> + <value>/etc/security/keytabs/smokeuser.headless.keytab</value> + <description>Path to smoke test user keytab file</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>user_group</name> + <display-name>Hadoop Group</display-name> + <value>hadoop</value> + <property-type>GROUP</property-type> + <description>Hadoop user group.</description> + <value-attributes> + <type>user</type> + <overridable>false</overridable> + </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml index 6089b27..32d86ca 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-conf.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_final="false" supports_adding_forbidden="true"> <property> <name>content</name> @@ -30,5 +29,7 @@ <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml index d94927d..0a99ed4 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml @@ -19,17 +19,20 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <property> <name>flume_conf_dir</name> <value>/etc/flume/conf</value> <description>Location to save configuration files</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>flume_log_dir</name> <value>/var/log/flume</value> <description>Location to save log files</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>flume_user</name> @@ -41,8 +44,9 @@ <type>user</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- flume-env.sh --> <property> <name>content</name> @@ -82,5 +86,7 @@ export JAVA_HOME={{java_home}} <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml index ce572ba..cba007f 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-log4j.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_final="false" supports_adding_forbidden="true"> <property> <name>content</name> @@ -30,5 +29,7 @@ <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml index e0f1ebe..b53cf87 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/configuration/ganglia-env.xml @@ -19,59 +19,77 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <property> <name>ganglia_conf_dir</name> <value>/etc/ganglia/hdp</value> <description>Config directory for Ganglia</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>ganglia_runtime_dir</name> <value>/var/run/ganglia/hdp</value> <description>Run directories for Ganglia</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>gmetad_user</name> <value>nobody</value> <property-type>USER GROUP</property-type> <description>User </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> + <property> <name>gmond_user</name> <value>nobody</value> <property-type>USER GROUP</property-type> <description>User </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>rrdcached_base_dir</name> <value>/var/lib/ganglia/rrds</value> <description>Default directory for saving the rrd files on ganglia server</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>rrdcached_timeout</name> <value>3600</value> <description>(-w) Data is written to disk every timeout seconds. If this option is not specified the default interval of 300 seconds will be used.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>rrdcached_flush_timeout</name> <value>7200</value> - <description>(-f) Every timeout seconds the entire cache is searched for old values which are written to disk. This only concerns files to which updates have stopped, so setting this to a high value, such as 3600 seconds, is acceptable in most cases. This timeout defaults to 3600 seconds.</description> + <description>(-f) Every timeout seconds the entire cache is searched for old values which are written to disk. This only concerns files to which updates have stopped, so setting this to a high value, such as 3600 seconds, is acceptable in most cases. This timeout defaults to 3600 seconds.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>rrdcached_delay</name> <value>1800</value> <description>(-z) If specified, rrdcached will delay writing of each RRD for a random number of seconds in the range [0,delay). This will avoid too many writes being queued simultaneously. This value should be no greater than the value specified in -w. By default, there is no delay.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>rrdcached_write_threads</name> <value>4</value> <description>(-t) Specifies the number of threads used for writing RRD files. The default is 4. Increasing this number will allow rrdcached to have more simultaneous I/O requests into the kernel. This may allow the kernel to re-order disk writes, resulting in better disk throughput.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>additional_clusters</name> <value> </value> <description>Add additional desired Ganglia metrics cluster in the form "name1:port1,name2:port2". Ensure that the names and ports are unique across all cluster and ports are available on ganglia server host. Ambari has reserved ports 8667-8669 within its own pool.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml index 0eafddd..0615a51 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <property> <name>hbase_log_dir</name> @@ -28,6 +27,8 @@ <value-attributes> <type>directory</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase_pid_dir</name> @@ -36,11 +37,15 @@ <value-attributes> <type>directory</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase_regionserver_heapsize</name> <value>1024</value> <description>HBase RegionServer Heap Size.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase_regionserver_xmn_max</name> @@ -50,29 +55,36 @@ Sets the upper bound on HBase RegionServers' young generation size. This value is used in case the young generation size (-Xmn) calculated based on the max heapsize (hbase_regionserver_heapsize) and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase_master_heapsize</name> <value>1024</value> <description>HBase Master Heap Size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> + <property> <name>hbase_user</name> <display-name>HBase User</display-name> <value>hbase</value> <property-type>USER</property-type> <description>HBase User Name.</description> <value-attributes> - <type>user</type> - <overridable>false</overridable> + <type>user</type> + <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- hbase-env.sh --> <property> <name>content</name> @@ -147,6 +159,7 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_ <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml index ec765e9..791fbd0 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-log4j.xml @@ -19,9 +19,7 @@ * limitations under the License. */ --> - <configuration supports_final="false" supports_adding_forbidden="true"> - <property> <name>content</name> <description>Custom log4j.properties</description> @@ -141,6 +139,7 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml index 2f12801..0de8039 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-policy.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_final="true"> <property> <name>security.client.protocol.acl</name> @@ -29,8 +28,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.admin.protocol.acl</name> <value>*</value> @@ -39,8 +39,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.masterregion.protocol.acl</name> <value>*</value> @@ -49,5 +50,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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml index 62b1a2c..4b063ee 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml @@ -32,6 +32,8 @@ into /tmp. Change this configuration else all data will be lost on machine restart. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.cluster.distributed</name> @@ -41,11 +43,15 @@ false, startup will run all HBase and ZooKeeper daemons together in the one JVM. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.master.port</name> <value>60000</value> <description>The port the HBase Master should bind to.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.tmp.dir</name> @@ -58,28 +64,38 @@ <value-attributes> <type>directory</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.local.dir</name> <value>${hbase.tmp.dir}/local</value> <description>Directory on the local filesystem to be used as a local storage </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.master.info.bindAddress</name> <value>0.0.0.0</value> <description>The bind address for the HBase Master web UI </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.master.info.port</name> <value>60010</value> <description>The port for the HBase Master web UI.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.regionserver.info.port</name> <value>60030</value> <description>The port for the HBase RegionServer web UI.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.regionserver.global.memstore.upperLimit</name> @@ -87,6 +103,8 @@ <description>Maximum size of all memstores in a region server before new updates are blocked and flushes are forced. Defaults to 40% of heap </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.regionserver.handler.count</name> @@ -95,6 +113,8 @@ Same property is used by the Master for count of master handlers. Default is 10. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.hregion.majorcompaction</name> @@ -103,8 +123,9 @@ HStoreFiles in a region. Default: 1 day. Set to 0 to disable automated major compactions. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hbase.regionserver.global.memstore.lowerLimit</name> <value>0.38</value> @@ -114,6 +135,8 @@ the minimum possible flushing to occur when updates are blocked due to memstore limiting. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.hregion.memstore.block.multiplier</name> @@ -125,6 +148,8 @@ resultant flush files take a long time to compact or split, or worse, we OOME </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.hregion.memstore.flush.size</name> @@ -134,6 +159,8 @@ exceeds this number of bytes. Value is checked by a thread that runs every hbase.server.thread.wakefrequency. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.hregion.memstore.mslab.enabled</name> @@ -144,6 +171,8 @@ heavy write loads. This can reduce the frequency of stop-the-world GC pauses on large heaps. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.hregion.max.filesize</name> @@ -153,6 +182,8 @@ grown to exceed this value, the hosting HRegion is split in two. Default: 1G. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.client.scanner.caching</name> @@ -164,6 +195,8 @@ Do not set this value such that the time between invocations is greater than the scanner timeout; i.e. hbase.regionserver.lease.period </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>zookeeper.session.timeout</name> @@ -175,6 +208,8 @@ "The client sends a requested timeout, the server responds with the timeout that it can give the client. " In milliseconds. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.client.keyvalue.maxsize</name> @@ -186,6 +221,8 @@ to set this to a fraction of the maximum region size. Setting it to zero or less disables the check. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.hstore.compactionThreshold</name> @@ -196,6 +233,8 @@ is run to rewrite all HStoreFiles files as one. Larger numbers put off compaction but when it runs, it takes longer to complete. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hbase.hstore.flush.retries.number</name> @@ -203,8 +242,9 @@ <description> The number of times the region flush operation will be retried. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hbase.hstore.blockingStoreFiles</name> <value>10</value> @@ -214,6 +254,8 @@ blocked for this HRegion until a compaction is completed, or until hbase.hstore.blockingWaitTime has been exceeded. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hfile.block.cache.size</name> @@ -223,8 +265,9 @@ used by HFile/StoreFile. Default of 0.25 means allocate 25%. Set to 0 to disable but it's not recommended. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- Additional configuration specific to HBase security --> <property> <name>hbase.superuser</name> @@ -233,37 +276,41 @@ full privileges, regardless of stored ACLs, across the cluster. Only used when HBase security is enabled. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hbase.security.authentication</name> <value>simple</value> <description> Controls whether or not secure authentication is enabled for HBase. Possible values are 'simple' (no authentication), and 'kerberos'. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hbase.security.authorization</name> <value>false</value> <description>Enables HBase authorization. Set the value of this property to false to disable HBase authorization. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hbase.coprocessor.region.classes</name> - <value></value> + <value/> <description>A comma-separated list of Coprocessors that are loaded by default on all tables. For any override coprocessor method, these classes will be called in order. After implementing your own Coprocessor, just put it in HBase's classpath and add the fully qualified class name here. A coprocessor can also be loaded on demand by setting HTableDescriptor. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hbase.coprocessor.master.classes</name> - <value></value> + <value/> <description>A comma-separated list of org.apache.hadoop.hbase.coprocessor.MasterObserver coprocessors that are loaded by default on the active HMaster process. For any implemented @@ -271,16 +318,18 @@ implementing your own MasterObserver, just put it in HBase's classpath and add the fully qualified class name here. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hbase.zookeeper.property.clientPort</name> <value>2181</value> <description>Property from ZooKeeper's config zoo.cfg. The port at which the clients will connect. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- The following three properties are used together to create the list of host:peer_port:leader_port quorum servers for ZooKeeper. @@ -295,19 +344,22 @@ list of ZooKeeper quorum servers. If HBASE_MANAGES_ZK is set in hbase-env.sh this is the list of servers which we will start/stop ZooKeeper on. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <!-- End of properties used to generate ZooKeeper host:port quorum list. --> - <property> <name>hbase.zookeeper.useMulti</name> <value>true</value> <description>Instructs HBase to make use of ZooKeeper's multi-update functionality. This allows certain ZooKeeper operations to complete more quickly and prevents some issues - with rare Replication failure scenarios (see the release note of HBASE-2611 for an example).· + with rare Replication failure scenarios (see the release note of HBASE-2611 for an example).· IMPORTANT: only set this to true if all ZooKeeper servers in the cluster are on version 3.4+ and will not be downgraded. ZooKeeper versions before 3.4 do not support multi-update and will not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495). </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>zookeeper.znode.parent</name> @@ -317,18 +369,21 @@ By default, all of HBase's ZooKeeper file path are configured with a relative path, so they will all go under this directory unless changed. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hbase.defaults.for.version.skip</name> <value>true</value> <description>Disables version verification.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.domain.socket.path</name> <value>/var/lib/hadoop-hdfs/dn_socket</value> <description>Path to domain socket.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/core-site.xml index 3dcff6d..7fba6aa 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/core-site.xml @@ -1,7 +1,6 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - - <!-- +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -17,13 +16,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Put site-specific property overrides in this file. --> - -<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> - -<!-- i/o properties --> - +<configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> + <!-- i/o properties --> <property> <name>io.file.buffer.size</name> <value>131072</value> @@ -31,24 +26,26 @@ The size of this buffer should probably be a multiple of hardware page size (4096 on Intel x86), and it determines how much data is buffered during read and write operations.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>io.serializations</name> <value>org.apache.hadoop.io.serializer.WritableSerialization</value> <description> A list of comma-delimited serialization classes that can be used for obtaining serializers and deserializers. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>io.compression.codecs</name> <value>org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec</value> <description>A list of the compression codec classes that can be used for compression/decompression.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -<!-- file system properties --> - + <!-- file system properties --> <property> <name>fs.defaultFS</name> <!-- cluster variant --> @@ -56,16 +53,18 @@ <description>The name of the default file system. Either the literal string "local" or a host:port for HDFS.</description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.trash.interval</name> <value>360</value> <description>Number of minutes between trash checkpoints. If zero, the trash feature is disabled. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- ipc properties: copied from kryptonite configuration --> <property> <name>ipc.client.idlethreshold</name> @@ -73,22 +72,25 @@ <description>Defines the threshold number of connections after which connections will be inspected for idleness. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ipc.client.connection.maxidletime</name> <value>30000</value> <description>The maximum time after which a client will bring down the connection to the server. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ipc.client.connect.max.retries</name> <value>50</value> <description>Defines the maximum number of retries for IPC connections.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ipc.server.tcpnodelay</name> <value>true</value> @@ -98,8 +100,9 @@ decrease latency with a cost of more/smaller packets. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- Web Interface Configuration --> <property> <name>mapreduce.jobtracker.webinterface.trusted</name> @@ -109,24 +112,28 @@ not be exposed to public. Enable this option if the interfaces are only reachable by those who have the right authorization. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> - <name>hadoop.security.authentication</name> - <value>simple</value> - <description> + <property> + <name>hadoop.security.authentication</name> + <value>simple</value> + <description> Set the authentication for the cluster. Valid values are: simple or kerberos. </description> - </property> -<property> - <name>hadoop.security.authorization</name> - <value>false</value> - <description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>hadoop.security.authorization</name> + <value>false</value> + <description> Enable authorization for different protocols. </description> -</property> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> <property> <name>hadoop.security.auth_to_local</name> <value> @@ -137,7 +144,7 @@ RULE:[2:$1@$0](rs@.*)s/.*/hbase/ DEFAULT </value> -<description>The mapping from kerberos principal names to local OS mapreduce.job.user.names. + <description>The mapping from kerberos principal names to local OS mapreduce.job.user.names. So the default rule is just "DEFAULT" which takes all principals in your default domain to their first component. "[email protected]" and "omalley/[email protected]" to "omalley", if your default domain is APACHE.ORG. The translations rules have 3 sections: @@ -175,6 +182,7 @@ If you want to treat all principals from APACHE.ORG with /admin as "admin", your RULE[2:$1%$2@$0](.%[email protected])s/./admin/ DEFAULT </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml index 6996a18..6b46f8b 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml @@ -19,57 +19,76 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <property> <name>hdfs_log_dir_prefix</name> <value>/var/log/hadoop</value> <description>Hadoop Log Dir Prefix</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hadoop_pid_dir_prefix</name> <value>/var/run/hadoop</value> <description>Hadoop PID Dir Prefix</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hadoop_root_logger</name> <value>INFO,RFA</value> <description>Hadoop Root Logger</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hadoop_heapsize</name> <value>1024</value> <description>Hadoop maximum Java heap size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>namenode_heapsize</name> <value>1024</value> <description>NameNode Java heap size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>namenode_opt_newsize</name> <value>200</value> <description>NameNode new generation size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>namenode_opt_maxnewsize</name> <value>200</value> <description>NameNode maximum new generation size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>namenode_opt_permsize</name> <value>128</value> <description>NameNode permanent generation size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>namenode_opt_maxpermsize</name> <value>256</value> <description>NameNode maximum permanent generation size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>dtnode_heapsize</name> <value>1024</value> <description>DataNode maximum Java heap size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>proxyuser_group</name> @@ -81,6 +100,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"/> </property> <property> <name>hdfs_user</name> @@ -92,8 +113,9 @@ <type>user</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- hadoop-env.sh --> <property> <name>content</name> @@ -187,12 +209,12 @@ export HADOOP_IDENT_STRING=$USER # Use libraries from standard classpath JAVA_JDBC_LIBS="" #Add libraries required by mysql connector -for jarFile in `ls /usr/share/java/*mysql* 2>/dev/null` +for jarFile in `ls /usr/share/java/*mysql* 2>/dev/null` do JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile done #Add libraries required by oracle connector -for jarFile in `ls /usr/share/java/*ojdbc* 2>/dev/null` +for jarFile in `ls /usr/share/java/*ojdbc* 2>/dev/null` do JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile done @@ -213,6 +235,7 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-a <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-policy.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-policy.xml index 41bde16..c147171 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-policy.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-policy.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,9 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Put site-specific property overrides in this file. --> - <configuration supports_final="true"> <property> <name>security.client.protocol.acl</name> @@ -29,8 +26,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.client.datanode.protocol.acl</name> <value>*</value> @@ -39,8 +37,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.datanode.protocol.acl</name> <value>*</value> @@ -49,8 +48,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.inter.datanode.protocol.acl</name> <value>*</value> @@ -59,8 +59,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.namenode.protocol.acl</name> <value>*</value> @@ -69,8 +70,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.inter.tracker.protocol.acl</name> <value>*</value> @@ -79,8 +81,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.job.client.protocol.acl</name> <value>*</value> @@ -89,8 +92,9 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.job.task.protocol.acl</name> <value>*</value> @@ -99,17 +103,19 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> + <property> <name>security.admin.operations.protocol.acl</name> <value>hadoop</value> <description>ACL for AdminOperationsProtocol. Used for admin commands. 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.refresh.usertogroups.mappings.protocol.acl</name> <value>hadoop</value> @@ -118,9 +124,10 @@ 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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -<property> + <property> <name>security.refresh.policy.protocol.acl</name> <value>hadoop</value> <description>ACL for RefreshAuthorizationPolicyProtocol, used by the @@ -128,7 +135,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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml index d9da76f..6738954 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-log4j.xml @@ -19,9 +19,7 @@ * limitations under the License. */ --> - <configuration supports_final="false" supports_adding_forbidden="true"> - <property> <name>content</name> <description>Custom log4j.properties</description> @@ -199,6 +197,7 @@ log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration>
