http://git-wip-us.apache.org/repos/asf/ambari/blob/6919aa50/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml index 3dd334d..99fa7e9 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,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"> - <!-- file system properties --> - <property> <name>dfs.namenode.name.dir</name> <!-- cluster variant --> @@ -33,29 +28,33 @@ of directories then the name table is replicated in all of the directories, for redundancy. </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>dfs.support.append</name> <value>true</value> <description>to enable dfs append</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>dfs.webhdfs.enabled</name> <value>true</value> <description>Whether to enable WebHDFS feature</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>dfs.datanode.failed.volumes.tolerated</name> <value>0</value> <description> Number of failed disks a DataNode would tolerate before it stops offering service</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>dfs.datanode.data.dir</name> <value>/hadoop/hdfs/data</value> @@ -66,8 +65,9 @@ Directories that do not exist are ignored. </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>dfs.hosts.exclude</name> <value>/etc/hadoop/conf/dfs.exclude</value> @@ -75,8 +75,9 @@ not permitted to connect to the namenode. The full pathname of the file must be specified. If the value is empty, no hosts are excluded.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- <property> <name>dfs.hosts</name> @@ -87,7 +88,6 @@ permitted.</description> </property> --> - <property> <name>dfs.namenode.checkpoint.dir</name> <value>/hadoop/hdfs/namesecondary</value> @@ -96,8 +96,9 @@ If this is a comma-delimited list of directories then the image is replicated in all of the directories for redundancy. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.checkpoint.edits.dir</name> <value>${dfs.namenode.checkpoint.dir}</value> @@ -107,16 +108,17 @@ replicated in all of the directoires for redundancy. Default value is same as dfs.namenode.checkpoint.dir </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> <name>dfs.namenode.checkpoint.period</name> <value>21600</value> <description>The number of seconds between two periodic checkpoints. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.checkpoint.txns</name> <value>1000000</value> @@ -124,28 +126,32 @@ of the namespace every 'dfs.namenode.checkpoint.txns' transactions, regardless of whether 'dfs.namenode.checkpoint.period' has expired. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.replication.max</name> <value>50</value> <description>Maximal block replication. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.replication</name> <value>3</value> <description>Default block replication. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.heartbeat.interval</name> <value>3</value> <description>Determines datanode heartbeat interval in seconds.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.safemode.threshold-pct</name> <value>1.0f</value> @@ -155,8 +161,9 @@ Values less than or equal to 0 mean not to start in safe mode. Values greater than 1 will make safe mode permanent. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.balance.bandwidthPerSec</name> <value>6250000</value> @@ -165,62 +172,70 @@ can utilize for the balancing purpose in term of the number of bytes per second. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.https.port</name> <value>50470</value> <description> This property is used by HftpFileSystem. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.address</name> <value>0.0.0.0:50010</value> <description> The datanode server address and port for data transfer. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.http.address</name> <value>0.0.0.0:50075</value> <description> The datanode http server address and port. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.https.address</name> <value>0.0.0.0:50475</value> <description> The datanode https server address and port. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.blocksize</name> <value>134217728</value> <description>The default block size for new files.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.http-address</name> <value>localhost:50070</value> <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>dfs.datanode.du.reserved</name> <!-- cluster variant --> <value>1073741824</value> <description>Reserved space in bytes per volume. Always leave this much space free for non dfs use. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.ipc.address</name> <value>0.0.0.0:8010</value> @@ -228,36 +243,40 @@ The datanode ipc server address and port. If the port is 0 then the server will start on a free port. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.blockreport.initialDelay</name> <value>120</value> <description>Delay for first block report in seconds.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.handler.count</name> <value>40</value> <description>The number of server threads for the namenode.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.max.transfer.threads</name> <value>1024</value> <description>Specifies the maximum number of threads to use for transferring data in and out of the datanode.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- Permissions configuration --> - <property> <name>fs.permissions.umask-mode</name> <value>022</value> <description> The octal umask used when creating files and directories. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.permissions.enabled</name> <value>true</value> @@ -268,20 +287,23 @@ Switching from one parameter value to the other does not change the mode, owner or group of files or directories. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.permissions.superusergroup</name> <value>hdfs</value> <description>The name of the group of super-users.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.handler.count</name> <value>100</value> <description>Added to grow Queue size so that more client connections are allowed</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.block.access.token.enable</name> <value>true</value> @@ -289,23 +311,24 @@ If "true", access tokens are used as capabilities for accessing datanodes. If "false", no access tokens are checked on accessing datanodes. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <!-- cluster variant --> <name>dfs.namenode.secondary.http-address</name> <value>localhost:50090</value> <description>Address of secondary namenode web server</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> <name>dfs.namenode.https-address</name> <value>localhost:50470</value> <description>The https address where namenode binds</description> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.data.dir.perm</name> <value>750</value> @@ -313,8 +336,9 @@ directories. The datanode will not come up if the permissions are different on existing dfs.datanode.data.dir directories. If the directories don't exist, they will be created with this permission.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.accesstime.precision</name> <value>0</value> @@ -322,14 +346,16 @@ The default value is 1 hour. Setting a value of 0 disables access times for HDFS. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.cluster.administrators</name> <value> hdfs</value> <description>ACL for who all can view the default servlets in the HDFS</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.avoid.read.stale.datanode</name> <value>true</value> @@ -338,6 +364,8 @@ heartbeat messages have not been received by the namenode for more than a specified time interval. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>dfs.namenode.avoid.write.stale.datanode</name> @@ -347,6 +375,8 @@ heartbeat messages have not been received by the namenode for more than a specified time interval. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>dfs.namenode.write.stale.datanode.ratio</name> @@ -354,36 +384,41 @@ <description>When the ratio of number stale datanodes to total datanodes marked is greater than this ratio, stop avoiding writing to stale nodes so as to prevent causing hotspots. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>dfs.namenode.stale.datanode.interval</name> <value>30000</value> <description>Datanode is stale after not getting a heartbeat in this interval in ms</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.journalnode.http-address</name> <value>0.0.0.0:8480</value> <description>The address and port the JournalNode web UI listens on. If the port is 0 then the server will start on a free port. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.journalnode.edits.dir</name> <value>/grid/0/hdfs/journal</value> <description>The path where the JournalNode daemon will store its local state. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- HDFS Short-Circuit Local Reads --> - <property> <name>dfs.client.read.shortcircuit</name> <value>true</value> <description> This configuration parameter turns on short-circuit local reads. </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> @@ -391,8 +426,9 @@ This is a path to a UNIX domain socket that will be used for communication between the DataNode and local HDFS clients. If the string "_PORT" is present in this path, it will be replaced by the TCP port of the DataNode. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.client.read.shortcircuit.streams.cache.size</name> <value>4096</value> @@ -402,15 +438,17 @@ more file descriptors, but potentially provide better performance on workloads involving lots of seeks. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.name.dir.restore</name> <value>true</value> <description>Set to true to enable NameNode to attempt recovering a previously failed dfs.namenode.name.dir. When enabled, a recovery of any failed directory is attempted during checkpoint.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.http.policy</name> <value>HTTP_ONLY</value> @@ -419,6 +457,7 @@ The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : Service is provided only on https - HTTP_AND_HTTPS : Service is provided both on http and https </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/HIVE/configuration/hcat-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml index f5615a4..5cf26dd 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hcat-env.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <!-- hcat-env.sh --> <property> @@ -55,6 +54,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/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml index 3dc90ae..16fcc48 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml @@ -19,12 +19,13 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <property> <name>hive_database_type</name> <value>postgres</value> <description>Default HIVE DB type.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hive_database</name> @@ -32,11 +33,15 @@ <description> Property that determines whether the HIVE DB is managed by Ambari. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hive_ambari_database</name> <value>PostgreSQL</value> <description>Database type.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hive_database_name</name> @@ -45,21 +50,29 @@ <value-attributes> <type>database</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hive_dbroot</name> <value>/usr/lib/hive/lib/</value> <description>Hive DB Directory.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hive_log_dir</name> <value>/var/log/hive</value> <description>Directory for Hive Log files.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hive_pid_dir</name> <value>/var/run/hive</value> <description>Hive PID Dir.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hive_user</name> @@ -71,19 +84,23 @@ <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> - <!--HCAT--> - <property> <name>hcat_log_dir</name> <value>/var/log/webhcat</value> <description>WebHCat Log Dir.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hcat_pid_dir</name> <value>/var/run/webhcat</value> <description>WebHCat Pid Dir.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>hcat_user</name> @@ -95,6 +112,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>webhcat_user</name> @@ -106,8 +125,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> - <!-- hive-env.sh --> <property> <name>content</name> @@ -150,6 +170,7 @@ export METASTORE_PORT={{hive_metastore_port}} <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/HIVE/configuration/hive-exec-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml index 47a06da..0b7015f 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-exec-log4j.xml @@ -19,9 +19,7 @@ * limitations under the License. */ --> - <configuration supports_final="false" supports_adding_forbidden="true"> - <property> <name>content</name> <description>Custom hive-exec-log4j</description> @@ -109,6 +107,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,FA <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/HIVE/configuration/hive-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-log4j.xml index a3be7ad..6769c6b 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-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> @@ -118,6 +116,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,DRFA <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/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml index 73c0dca..9019773 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml @@ -16,16 +16,15 @@ 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. --> - <configuration supports_final="true"> - <property> <name>hive.heapsize</name> <value>1024</value> <description>Hive Java heap size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -<!-- Begin changes metastore database to postgres --> + <!-- Begin changes metastore database to postgres --> <property> <name>ambari.hive.db.schema.name</name> <value>hive</value> @@ -33,93 +32,107 @@ limitations under the License. <value-attributes> <type>database</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>javax.jdo.option.ConnectionURL</name> <value>jdbc:postgresql://localhost/hive</value> <description>JDBC connect string for a JDBC metastore</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>javax.jdo.option.ConnectionDriverName</name> <value>org.postgresql.Driver</value> <description>Driver class name for a JDBC metastore</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> -<!-- End changes metastore database to postgres --> - + <!-- End changes metastore database to postgres --> <property> <name>javax.jdo.option.ConnectionUserName</name> <value>hive</value> <description>username to use against metastore database</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property require-input="true"> <name>javax.jdo.option.ConnectionPassword</name> - <value></value> + <value/> <property-type>PASSWORD</property-type> <description>password to use against metastore database</description> <value-attributes> <type>password</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.warehouse.dir</name> <value>/apps/hive/warehouse</value> <description>location of default database for the warehouse</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.sasl.enabled</name> <value>false</value> <description>If true, the metastore thrift interface will be secured with SASL. Clients must authenticate with Kerberos.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.cache.pinobjtypes</name> <value>Table,Database,Type,FieldSchema,Order</value> <description>List of comma separated metastore object types that should be pinned in the cache</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.uris</name> <value>thrift://localhost:9083</value> <description>URI for client to contact metastore server</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.client.socket.timeout</name> <value>60</value> <description>MetaStore Client socket timeout in seconds</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.execute.setugi</name> <value>true</value> <description>In unsecure mode, setting this property to true will cause the metastore to execute DFS operations using the client's reported user and group permissions. Note that this property must be set on both the client and server sides. Further note that its best effort. If client sets its to true and server sets it to false, client setting will be ignored.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.security.authorization.enabled</name> <value>false</value> <description>enable or disable the hive client authorization</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.security.authorization.manager</name> <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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.security.metastore.authorization.manager</name> <value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</value> <description>The authorization manager class name to be used in the metastore for authorization. The user-defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.pre.event.listeners</name> <value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener</value> @@ -127,8 +140,9 @@ limitations under the License. whenever databases, tables, and partitions are created, altered, or dropped. Set to org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener if metastore-side authorization is desired.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.pre.event.listeners</name> <value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener</value> @@ -136,14 +150,16 @@ limitations under the License. whenever databases, tables, and partitions are created, altered, or dropped. Set to org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener if metastore-side authorization is desired.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <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="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.enable.doAs</name> <value>true</value> @@ -151,56 +167,65 @@ limitations under the License. submitted the query. But if the parameter is set to false, the query will run as the user that the hiveserver2 process runs as. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.enable.impersonation</name> <description>Enable user impersonation for HiveServer2</description> <value>true</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.authentication</name> <description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description> <value>NOSASL</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.hdfs.impl.disable.cache</name> <value>true</value> <description>Disable HDFS filesystem cache.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.file.impl.disable.cache</name> <value>true</value> <description>Disable local filesystem cache.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.enforce.bucketing</name> <value>true</value> <description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.enforce.sorting</name> <value>true</value> <description>Whether sorting is enforced. If true, while inserting into the table, sorting is enforced.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.enforce.sortmergebucketmapjoin</name> <value>true</value> <description>If the user asked for sort-merge bucketed map-side join, and it cannot be performed, should the query fail or not</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.map.aggr</name> <value>true</value> <description>Whether to use map-side aggregation in Hive Group By queries.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.optimize.bucketmapjoin</name> <value>true</value> @@ -208,43 +233,49 @@ limitations under the License. is a multiple of the number of buckets in the other table, the buckets can be joined with each other by setting this parameter as true. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.optimize.bucketmapjoin.sortedmerge</name> <value>false</value> <description> If the tables being joined are sorted and bucketized on the join columns, and they have the same number of buckets, a sort-merge join can be performed by setting this parameter as true. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.mapred.reduce.tasks.speculative.execution</name> <value>false</value> <description>Whether speculative execution for reducers should be turned on.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.auto.convert.join</name> <value>true</value> <description>Whether Hive enable the optimization about converting common join into mapjoin based on the input file size.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.auto.convert.sortmerge.join</name> <value>true</value> <description>Will the join be automatically converted to a sort-merge join, if the joined tables pass the criteria for sort-merge join. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.auto.convert.sortmerge.join.noconditionaltask</name> <value>true</value> <description>Required to Enable the conversion of an SMB (Sort-Merge-Bucket) to a map-join SMB.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.auto.convert.join.noconditionaltask</name> <value>true</value> @@ -252,8 +283,9 @@ limitations under the License. size. If this paramater is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than the specified size, the join is directly converted to a mapjoin (there is no conditional task). </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.auto.convert.join.noconditionaltask.size</name> <value>1000000000</value> @@ -261,8 +293,9 @@ limitations under the License. is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than this size, the join is directly converted to a mapjoin(there is no conditional task). The default is 10MB. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.optimize.reducededuplication.min.reducer</name> <value>4</value> @@ -270,8 +303,9 @@ limitations under the License. That means if reducer-num of the child RS is fixed (order by or forced bucketing) and small, it can make very slow, single MR. The optimization will be disabled if number of reducers is less than specified value. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.optimize.mapjoin.mapreduce</name> <value>true</value> @@ -280,8 +314,9 @@ limitations under the License. job (for e.g a group by), each map-only job is merged with the following map-reduce job. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.mapjoin.bucket.cache.size</name> <value>10000</value> @@ -289,36 +324,41 @@ limitations under the License. Size per reducer.The default is 1G, i.e if the input size is 10G, it will use 10 reducers. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.vectorized.execution.enabled</name> <value>true</value> <description>This flag controls the vectorized mode of query execution as documented in HIVE-4160 (as of Hive 0.13.0) </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.optimize.reducededuplication</name> <value>true</value> <description>Remove extra map-reduce jobs if the data is already clustered by the same key which needs to be used again. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.optimize.index.filter</name> <value>true</value> <description> Whether to enable automatic use of indexes </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.execution.engine</name> <value>mr</value> <description>Whether to use MR or Tez</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- <property> <name>hive.exec.post.hooks</name> @@ -338,51 +378,57 @@ limitations under the License. <description>Comma-separated list of on-failure hooks to be invoked for each statement.</description> </property> --> - <property> <name>hive.vectorized.groupby.maxentries</name> <value>100000</value> <description>Max number of entries in the vector group by aggregation hashtables. Exceeding this will trigger a flush irrelevant of memory pressure condition. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.vectorized.groupby.checkinterval</name> <value>1024</value> <description>Number of entries added to the group by aggregation hash before a reocmputation of average entry size is performed.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.vectorized.groupby.flush.percent</name> <value>0.1</value> <description>Percent of entries in the group by aggregation hash flushed when the memory treshold is exceeded.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.stats.autogather</name> <value>true</value> <description>A flag to gather statistics automatically during the INSERT OVERWRITE command.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.tez.container.size</name> <value>682</value> <description>By default, Tez uses the java options from map tasks. Use this property to override that value. Assigned value must match value specified for mapreduce.map.child.java.opts.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.tez.input.format</name> <value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value> <description>The default input format for Tez. Tez groups splits in the Application Master.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.tez.java.opts</name> <value>-server -Xmx1024m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC</value> <description>Java command line options for Tez. Must be assigned the same value as mapreduce.map.child.java.opts.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.compute.query.using.stats</name> <value>true</value> @@ -391,8 +437,9 @@ limitations under the License. stored in metastore. For basic stats collection turn on the config hive.stats.autogather to true. For more advanced stats collection need to run analyze table queries. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.orc.splits.include.file.footer</name> <value>false</value> @@ -400,128 +447,148 @@ limitations under the License. If turned on splits generated by orc will include metadata about the stripes in the file. This data is read remotely (from the client or HS2 machine) and sent to all the tasks. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.limit.optimize.enable</name> <value>true</value> <description>Whether to enable the optimization of trying a smaller subset of data for simple LIMIT first.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.limit.pushdown.memory.usage</name> <value>0.04</value> <description>The max memory to be used for hash in RS operator for top K selection.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.tez.default.queues</name> <value>default</value> <description>A comma-separated list of queues configured for the cluster.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.tez.sessions.per.default.queue</name> <value>1</value> <description>The number of sessions for each queue named in the hive.server2.tez.default.queues.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.tez.initialize.default.sessions</name> <value>false</value> <description>Enables a user to use HiveServer2 without enabling Tez for HiveServer2. Users may potentially may want to run queries with Tez without a pool of sessions.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.txn.manager</name> <value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value> <description>Select the class to do transaction management. The default DummyTxnManager does no transactions and retains the legacy behavior.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.txn.timeout</name> <value>300</value> <description>Time after which transactions are declared aborted if the client has not sent a heartbeat, in seconds.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.txn.max.open.batch</name> <value>1000</value> <description>Maximum number of transactions that can be fetched in one call to open_txns(). Increasing this will decrease the number of delta files created when streaming data into Hive. But it will also increase the number of open transactions at any given time, possibly impacting read performance.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.compactor.initiator.on</name> <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> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.compactor.worker.threads</name> <value>0</value> <description>Number of compactor worker threads to run on this metastore instance. Can be different values on different metastore instances.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.compactor.worker.timeout</name> <value>86400L</value> <description>Time, in seconds, before a given compaction in working state is declared a failure and returned to the initiated state.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.compactor.check.interval</name> <value>300L</value> <description>Time in seconds between checks to see if any partitions need compacted. This should be kept high because each check for compaction requires many calls against the NameNode.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.compactor.delta.num.threshold</name> <value>10</value> <description>Number of delta files that must exist in a directory before the compactor will attempt a minor compaction.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.compactor.delta.pct.threshold</name> <value>0.1f</value> <description>Percentage (by size) of base that deltas can be before major compaction is initiated.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.compactor.abortedtxn.threshold</name> <value>1000</value> <description>Number of aborted transactions involving a particular table or partition before major compaction is initiated.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>datanucleus.cache.level2.type</name> <value>none</value> <description>Determines caching mechanism DataNucleus L2 cache will use. It is strongly recommended to use default value of 'none' as other values may cause consistency errors in Hive.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.thrift.port</name> <value>10000</value> <description> TCP port number to listen on, default 10000. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> - <name>hive.server2.authentication.spnego.principal</name> - <value>HTTP/[email protected]</value> - <description> + <name>hive.server2.authentication.spnego.principal</name> + <value>HTTP/[email protected]</value> + <description> This keytab would be used by HiveServer2 when Kerberos security is enabled and HTTP transport mode is used. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> - <name>hive.server2.authentication.spnego.keytab</name> - <value>/etc/security/keytabs/spnego.service.keytab</value> - <description> + <name>hive.server2.authentication.spnego.keytab</name> + <value>/etc/security/keytabs/spnego.service.keytab</value> + <description> The SPNEGO service principal would be used by HiveServer2 when Kerberos security is enabled and HTTP transport mode is used. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.support.dynamic.service.discovery</name> <value>false</value> @@ -531,14 +598,16 @@ limitations under the License. should use the ZooKeeper ensemble: hive.zookeeper.quorum in their connection string. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.zookeeper.namespace</name> <value>hiveserver2</value> <description>The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery. </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/HIVE/configuration/webhcat-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml index 74b65b6..49d6267 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-env.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <!-- webhcat-env.sh --> <property> @@ -52,6 +51,7 @@ export HADOOP_HOME={{hadoop_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/HIVE/configuration/webhcat-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-site.xml index 951dcda..c8b4e48 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/webhcat-site.xml @@ -16,123 +16,136 @@ 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. --> - <!-- The default settings for Templeton. --> <!-- Edit templeton-site.xml to change settings for your local --> <!-- install. --> - <configuration supports_final="true"> - <property> <name>templeton.port</name> - <value>50111</value> + <value>50111</value> <description>The HTTP port for the main server.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.hadoop.conf.dir</name> <value>/etc/hadoop/conf</value> <description>The path to the Hadoop configuration.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.jar</name> <value>/usr/lib/hcatalog/share/webhcat/svr/webhcat.jar</value> <description>The path to the Templeton jar file.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.libjars</name> <value>/usr/lib/zookeeper/zookeeper.jar</value> <description>Jars to add the the classpath.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> <name>templeton.hadoop</name> <value>/usr/bin/hadoop</value> <description>The path to the Hadoop executable.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.pig.archive</name> <value>hdfs:///apps/webhcat/pig.tar.gz</value> <description>The path to the Pig archive.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.pig.path</name> <value>pig.tar.gz/pig/bin/pig</value> <description>The path to the Pig executable.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.hcat</name> <value>/usr/bin/hcat</value> <description>The path to the hcatalog executable.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.hive.archive</name> <value>hdfs:///apps/webhcat/hive.tar.gz</value> <description>The path to the Hive archive.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.hive.home</name> <value>hive.tar.gz/hive</value> <description>The path to the Hive home within the tar. Has no effect if templeton.hive.archive is not set.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.hcat.home</name> <value>hive.tar.gz/hive/hcatalog</value> <description>The path to the HCat home within the tar. Has no effect if templeton.hive.archive is not set.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.hive.path</name> <value>hive.tar.gz/hive/bin/hive</value> <description>The path to the Hive executable.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.hive.properties</name> <value>hive.metastore.local=false,hive.metastore.uris=thrift://localhost:9933,hive.metastore.sasl.enabled=false</value> <description>Properties to set when running hive.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> <name>templeton.zookeeper.hosts</name> <value>localhost:2181</value> <description>ZooKeeper servers, as comma separated host:port pairs</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>templeton.storage.class</name> <value>org.apache.hive.hcatalog.templeton.tool.ZooKeeperStorage</value> <description>The class to use as storage</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> - <name>templeton.override.enabled</name> - <value>false</value> - <description> + <name>templeton.override.enabled</name> + <value>false</value> + <description> Enable the override path in templeton.override.jars </description> - </property> - - <property> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> <name>templeton.streaming.jar</name> <value>hdfs:///apps/webhcat/hadoop-streaming.jar</value> <description>The hdfs path to the Hadoop streaming jar file.</description> - </property> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> <property> <name>templeton.exec.timeout</name> <value>60000</value> <description>Time out for templeton api</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/OOZIE/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml index 5bc5d60..5408eed 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <property> <name>oozie_user</name> @@ -31,38 +30,51 @@ <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>oozie_database</name> <value>New Derby Database</value> <description>Oozie Server Database.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie_derby_database</name> <value>Derby</value> <description>Oozie Derby Database</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie_data_dir</name> <value>/hadoop/oozie/data</value> <description>Data directory in which the Oozie DB exists</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie_log_dir</name> <value>/var/log/oozie</value> <description>Directory for oozie logs</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie_pid_dir</name> <value>/var/run/oozie</value> <description>Directory in which the pid files for oozie reside.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie_admin_port</name> <value>11001</value> <description>The admin port Oozie server runs.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- oozie-env.sh --> <property> <name>content</name> @@ -132,6 +144,7 @@ export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64 <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/OOZIE/configuration/oozie-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-log4j.xml index 111c8db..cb28922 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-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> @@ -95,6 +93,7 @@ log4j.logger.org.apache.hadoop.security.authentication.server=INFO, oozie <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/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml index 94d27cc..f8aeceb 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml @@ -16,9 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - <configuration supports_final="true"> - <!-- Refer to the oozie-default.xml file for the complete list of Oozie configuration properties and their default values. @@ -27,24 +25,27 @@ <name>oozie.base.url</name> <value>http://localhost:11000/oozie</value> <description>Base Oozie URL.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.system.id</name> <value>oozie-${user.name}</value> <description> The Oozie system ID. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.systemmode</name> <value>NORMAL</value> <description> System mode for Oozie at startup. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.AuthorizationService.security.enabled</name> <value>true</value> @@ -52,36 +53,41 @@ Specifies whether security (user name/admin role) is enabled or not. If disabled any user can manage Oozie system and manage any job. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.PurgeService.older.than</name> <value>30</value> <description> Jobs older than this value, in days, will be purged by the PurgeService. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.PurgeService.purge.interval</name> <value>3600</value> <description> Interval at which the purge service will run, in seconds. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.CallableQueueService.queue.size</name> <value>1000</value> <description>Max callable queue size</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.CallableQueueService.threads</name> <value>10</value> <description>Number of threads used for executing callables</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.CallableQueueService.callable.concurrency</name> <value>3</value> @@ -92,16 +98,18 @@ All commands that use action executors (action-start, action-end, action-kill and action-check) use the action type as the callable type. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.coord.normal.default.timeout</name> <value>120</value> <description>Default timeout for a coordinator action input check (in minutes) for normal job. -1 means infinite timeout </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.db.schema.name</name> <value>oozie</value> @@ -111,8 +119,9 @@ <value-attributes> <type>database</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.authentication.type</name> <value>simple</value> @@ -120,8 +129,9 @@ Authentication used for Oozie HTTP endpoint, the supported values are: simple | kerberos | #AUTHENTICATION_HANDLER_CLASSNAME#. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.WorkflowAppService.system.libpath</name> <value>/user/${user.name}/share/lib</value> @@ -130,8 +140,9 @@ This path is added to workflow application if their job properties sets the property 'oozie.use.system.libpath' to true. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>use.system.libpath.for.mapreduce.and.pig.jobs</name> <value>false</value> @@ -141,6 +152,8 @@ specify where the Pig JAR files are. Instead, the ones from the system library path are used. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie.authentication.kerberos.name.rules</name> @@ -152,6 +165,8 @@ </value> <description>The mapping from kerberos principal names to local OS user names.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie.service.HadoopAccessorService.hadoop.configurations</name> @@ -164,6 +179,8 @@ the Oozie configuration directory; though the path can be absolute (i.e. to point to Hadoop client conf/ directories in the local filesystem. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie.service.ActionService.executor.ext.classes</name> @@ -179,8 +196,9 @@ be used in workflows. This property is a convenience property to add extensions to the built in executors without having to include all the built in ones. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.SchemaService.wf.ext.schemas</name> <value>shell-action-0.1.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,sqoop-action-0.2.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd,shell-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd,hive-action-0.3.xsd</value> @@ -188,6 +206,8 @@ Schemas for additional actions types. IMPORTANT: if there are no schemas leave a 1 space string, the service trims the value, if empty Configuration assumes it is NULL. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie.service.JPAService.create.db.schema</name> @@ -198,33 +218,37 @@ If set to true, it creates the DB schema if it does not exist. If the DB schema exists is a NOP. If set to false, it does not create the DB schema. If the DB schema does not exist it fails start up. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.JPAService.jdbc.driver</name> <value>org.apache.derby.jdbc.EmbeddedDriver</value> <description> JDBC driver class. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.JPAService.jdbc.url</name> <value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value> <description> JDBC URL. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.JPAService.jdbc.username</name> <value>oozie</value> <description> Database user name to use to connect to the database </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property require-input = "true"> + <property require-input="true"> <name>oozie.service.JPAService.jdbc.password</name> <value> </value> <property-type>PASSWORD</property-type> @@ -237,17 +261,18 @@ <value-attributes> <type>password</type> </value-attributes> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.service.JPAService.pool.max.active.conn</name> <value>10</value> <description> Max number of connections. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>oozie.services</name> <value> @@ -284,6 +309,8 @@ org.apache.oozie.service.ProxyUserService </value> <description>List of Oozie services</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie.service.URIHandlerService.uri.handlers</name> @@ -291,6 +318,8 @@ <description> Enlist the different uri handlers supported for data availability checks. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie.services.ext</name> @@ -300,6 +329,8 @@ To add/replace services defined in 'oozie.services' with custom implementations. Class names must be separated by commas. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie.service.coord.push.check.requeue.interval</name> @@ -307,6 +338,8 @@ <description> Command re-queue interval for push dependencies (in millisecond). </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>oozie.credentials.credentialclasses</name> @@ -314,6 +347,7 @@ <description> Credential Class to be used for HCat. </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/PIG/configuration/pig-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml index d2dca75..f883b4d 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-env.xml @@ -19,7 +19,6 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <!-- pig-env.sh --> <property> @@ -36,6 +35,7 @@ fi <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/PIG/configuration/pig-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml index a3bcdd4..5715e2a 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-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> @@ -60,6 +58,7 @@ log4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n <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/PIG/configuration/pig-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml index 7f1dc08..0070078 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/PIG/configuration/pig-properties.xml @@ -19,9 +19,7 @@ * limitations under the License. */ --> - <configuration supports_final="false" supports_adding_forbidden="true"> - <property> <name>content</name> <description>Describe all the Pig agent configurations</description> @@ -90,6 +88,7 @@ hcat.bin=/usr/bin/hcat <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/YARN/configuration-mapred/mapred-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml index 1263238..f90b3ae 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml @@ -19,17 +19,20 @@ * limitations under the License. */ --> - <configuration supports_adding_forbidden="true"> <property> <name>mapred_log_dir_prefix</name> <value>/var/log/hadoop-mapreduce</value> <description>Mapreduce 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>mapred_pid_dir_prefix</name> <value>/var/run/hadoop-mapreduce</value> <description>Mapreduce 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>mapred_user</name> @@ -41,13 +44,16 @@ <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>jobhistory_heapsize</name> <value>900</value> <description>Value for JobHistoryServer heap_size variable in hadoop-env.sh</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- mapred-env.sh --> <property> <name>content</name> @@ -69,5 +75,7 @@ export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration>
