bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [27/52] bigtop git commit: Add Hive 1.2 to ODPi ambari reference implementation
Date Wed, 22 Mar 2017 06:10:18 GMT
Add Hive 1.2 to ODPi ambari reference implementation

(cherry picked from commit e49f7e6b8bbf5650c36df0f2bfc7c4f7474ca5b2)


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b6475d77
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b6475d77
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b6475d77

Branch: refs/heads/master
Commit: b6475d7762ac57b9fe07edd48f3ea3fc2f05bdbd
Parents: ba8d7f5
Author: Sumit Mohanty <sumit.mohanty@gmail.com>
Authored: Wed Oct 26 17:46:24 2016 -0700
Committer: Roman Shaposhnik <rvs@apache.org>
Committed: Tue Mar 21 23:08:09 2017 -0700

----------------------------------------------------------------------
 .../ambari/ODPi/1.0/role_command_order.json     |   1 +
 .../HIVE/configuration/beeline-log4j2.xml       |  62 --
 .../hive-atlas-application.properties.xml       |  67 --
 .../HIVE/configuration/hive-exec-log4j2.xml     |  83 --
 .../HIVE/configuration/hive-interactive-env.xml | 373 --------
 .../configuration/hive-interactive-site.xml     | 909 -------------------
 .../services/HIVE/configuration/hive-log4j2.xml |  90 --
 .../hiveserver2-interactive-site.xml            |  56 --
 .../HIVE/configuration/llap-cli-log4j2.xml      |  91 --
 .../HIVE/configuration/llap-daemon-log4j.xml    | 158 ----
 .../HIVE/configuration/ranger-hive-audit.xml    | 136 ---
 .../ranger-hive-plugin-properties.xml           |  63 --
 .../configuration/ranger-hive-policymgr-ssl.xml |  71 --
 .../HIVE/configuration/ranger-hive-security.xml |  81 --
 .../HIVE/configuration/tez-interactive-site.xml | 144 ---
 .../ambari/ODPi/1.0/services/HIVE/metainfo.xml  | 158 +---
 .../HIVE/package/scripts/params_linux.py        |  42 +-
 .../HIVE/package/scripts/status_params.py       |  14 +-
 .../services/YARN/configuration/yarn-site.xml   | 207 ++++-
 .../ambari/ODPi/1.0/services/YARN/metainfo.xml  |  14 +
 20 files changed, 230 insertions(+), 2590 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/role_command_order.json
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/role_command_order.json b/bigtop-packages/src/common/ambari/ODPi/1.0/role_command_order.json
index 31f26e3..05beb76 100755
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/role_command_order.json
+++ b/bigtop-packages/src/common/ambari/ODPi/1.0/role_command_order.json
@@ -5,6 +5,7 @@
     "_comment" : "dependencies for all cases",
     "HBASE_MASTER-START": ["ZOOKEEPER_SERVER-START"],
     "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"],
+    "APP_TIMELINE_SERVER-START": ["NAMENODE-START", "DATANODE-START"],
     "OOZIE_SERVER-START": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
     "WEBHCAT_SERVER-START": ["NODEMANAGER-START", "HIVE_SERVER-START"],
     "WEBHCAT_SERVER-RESTART": ["NODEMANAGER-RESTART", "HIVE_SERVER-RESTART"],

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/beeline-log4j2.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/beeline-log4j2.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/beeline-log4j2.xml
deleted file mode 100755
index 03de64e..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/beeline-log4j2.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<configuration><property require-input="false">
-    <name>content</name>
-    <value>
-# 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.
-
-status = INFO
-name = BeelineLog4j2
-packages = org.apache.hadoop.hive.ql.log
-
-# list of properties
-property.hive.log.level = WARN
-property.hive.root.logger = console
-
-# list of all appenders
-appenders = console
-
-# console appender
-appender.console.type = Console
-appender.console.name = console
-appender.console.target = SYSTEM_ERR
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
-
-# list of all loggers
-loggers = HiveConnection
-
-# HiveConnection logs useful info for dynamic service discovery
-logger.HiveConnection.name = org.apache.hive.jdbc.HiveConnection
-logger.HiveConnection.level = INFO
-
-# root logger
-rootLogger.level = ${sys:hive.log.level}
-rootLogger.appenderRefs = root
-rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}
-  </value>
-    <description>Custom beeline-log4j2.properties</description>
-    <display-name>beeline-log4j template</display-name>
-    <filename>beeline-log4j2.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>content</type>
-        <show-property-name>false</show-property-name>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-atlas-application.properties.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-atlas-application.properties.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-atlas-application.properties.xml
deleted file mode 100755
index 7eb72ef..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-atlas-application.properties.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<configuration><property require-input="false">
-    <name>atlas.hook.hive.synchronous</name>
-    <value>false</value>
-    <description></description>
-    <filename>hive-atlas-application.properties.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>atlas.hook.hive.numRetries</name>
-    <value>3</value>
-    <description></description>
-    <filename>hive-atlas-application.properties.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>atlas.hook.hive.minThreads</name>
-    <value>5</value>
-    <description></description>
-    <filename>hive-atlas-application.properties.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>atlas.hook.hive.maxThreads</name>
-    <value>5</value>
-    <description></description>
-    <filename>hive-atlas-application.properties.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>atlas.hook.hive.keepAliveTime</name>
-    <value>10</value>
-    <description></description>
-    <filename>hive-atlas-application.properties.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>atlas.hook.hive.queueSize</name>
-    <value>1000</value>
-    <description></description>
-    <filename>hive-atlas-application.properties.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-exec-log4j2.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-exec-log4j2.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-exec-log4j2.xml
deleted file mode 100755
index c818d43..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-exec-log4j2.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<configuration><property require-input="false">
-    <name>content</name>
-    <value>
-# 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.
-
-status = INFO
-name = HiveExecLog4j2
-packages = org.apache.hadoop.hive.ql.log
-
-# list of properties
-property.hive.log.level = INFO
-property.hive.root.logger = FA
-property.hive.query.id = hadoop
-property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
-property.hive.log.file = ${sys:hive.query.id}.log
-
-# list of all appenders
-appenders = console, FA
-
-# console appender
-appender.console.type = Console
-appender.console.name = console
-appender.console.target = SYSTEM_ERR
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
-
-# simple file appender
-appender.FA.type = File
-appender.FA.name = FA
-appender.FA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
-appender.FA.layout.type = PatternLayout
-appender.FA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n
-
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
-
-logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
-logger.NIOServerCnxn.level = WARN
-
-logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
-logger.ClientCnxnSocketNIO.level = WARN
-
-logger.DataNucleus.name = DataNucleus
-logger.DataNucleus.level = ERROR
-
-logger.Datastore.name = Datastore
-logger.Datastore.level = ERROR
-
-logger.JPOX.name = JPOX
-logger.JPOX.level = ERROR
-
-# root logger
-rootLogger.level = ${sys:hive.log.level}
-rootLogger.appenderRefs = root
-rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}
-  </value>
-    <description>Custom hive-exec-log4j2.properties</description>
-    <display-name>hive-exec-log4j2 template</display-name>
-    <filename>hive-exec-log4j2.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>content</type>
-        <show-property-name>false</show-property-name>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-interactive-env.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-interactive-env.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-interactive-env.xml
deleted file mode 100755
index 7035283..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-interactive-env.xml
+++ /dev/null
@@ -1,373 +0,0 @@
-<configuration><property require-input="false">
-    <name>enable_hive_interactive</name>
-    <value>false</value>
-    <description>Enable or disable interactive query in this cluster.</description>
-    <display-name>Enable Interactive Query (Tech Preview)</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>value-list</type>
-        <overridable>false</overridable>
-        <entries>
-            <entry>
-                <value>true</value>
-                <label>Yes</label>
-            </entry>
-            <entry>
-                <value>false</value>
-                <label>No</label>
-            </entry>
-        </entries>
-        <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by>
-        <dependedByProperties>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.daemon.num.executors</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>llap_heap_size</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>tez.am.resource.memory.mb</name>
-            <type>tez-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.daemon.yarn.container.mb</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>capacity-scheduler</name>
-            <type>capacity-scheduler</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.io.memory.size</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>num_llap_nodes</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>slider_am_container_mb</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-    </property_depended_by>
-</property><property require-input="false">
-    <name>hive_server_interactive_host</name>
-    <value>localhost</value>
-    <description>HiveServer2 Interactive Host</description>
-    <display-name>HiveServer2 Interactive Host</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <overridable>false</overridable>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>llap_queue_capacity</name>
-    <value>0</value>
-    <description>Percentage of the cluster dedicated to interactive query.</description>
-    <display-name>% of Cluster Capacity</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-        <maximum>100</maximum>
-        <minimum>20</minimum>
-        <increment-step>1</increment-step>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-    </depends-on>
-    <property_depended_by>
-        <dependedByProperties>
-            <name>hive.llap.daemon.num.executors</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>llap_heap_size</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>tez.am.resource.memory.mb</name>
-            <type>tez-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.daemon.yarn.container.mb</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>capacity-scheduler</name>
-            <type>capacity-scheduler</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.io.memory.size</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>num_llap_nodes</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>slider_am_container_mb</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-    </property_depended_by>
-</property><property require-input="false">
-    <name>num_llap_nodes</name>
-    <value>1</value>
-    <description>The number of Hive LLAP daemons to run.</description>
-    <display-name>Number of LLAP Daemons</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-        <minimum>1</minimum>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-        <property>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>num_retries_for_checking_llap_status</name>
-    <value>10</value>
-    <description>After starting LLAP app, retry count to check LLAP status before starting HiveServer2.</description>
-    <display-name>Number of retries while checking LLAP app status</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-        <maximum>20</maximum>
-        <minimum>0</minimum>
-        <increment-step>1</increment-step>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>llap_heap_size</name>
-    <value>0</value>
-    <description>Heap Size used by LLAP app.</description>
-    <display-name>LLAP heap size</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>tez.am.resource.memory.mb</name>
-            <type>tez-site</type>
-        </property>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-        <property>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>slider_am_container_mb</name>
-    <value>341</value>
-    <description>Slider's app master container size in MB.</description>
-    <display-name>Slider AM container size</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-        <unit>MB</unit>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-        <property>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>llap_log_level</name>
-    <value>INFO</value>
-    <description>LLAP app logging level (WARN/INFO/DEBUG/TRACE)</description>
-    <display-name>LLAP app logging level (WARN/INFO/DEBUG/TRACE)</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>llap_app_name</name>
-    <value>llap0</value>
-    <description>LLAP app name</description>
-    <display-name>LLAP app name</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>llap_java_opts</name>
-    <value>-XX:+AlwaysPreTouch {% if java_version &gt; 7 %}-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200{% else %}-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC{% endif %}</value>
-    <description>Java opts for llap application</description>
-    <display-name>LLAP app java opts</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>content</name>
-    <value>
-      if [ "$SERVICE" = "cli" ]; then
-      if [ -z "$DEBUG" ]; then
-      export HADOOP_OPTS="$HADOOP_OPTS -XX:NewRatio=12 -XX:MaxHeapFreeRatio=40 -XX:MinHeapFreeRatio=15 -XX:+UseParNewGC -XX:-UseGCOverheadLimit"
-      else
-      export HADOOP_OPTS="$HADOOP_OPTS -XX:NewRatio=12 -XX:MaxHeapFreeRatio=40 -XX:MinHeapFreeRatio=15 -XX:-UseGCOverheadLimit"
-      fi
-      fi
-
-      # The heap size of the jvm stared by hive shell script can be controlled via:
-
-      if [ "$SERVICE" = "metastore" ]; then
-      export HADOOP_HEAPSIZE={{hive_metastore_heapsize}} # Setting for HiveMetastore
-      else
-      export HADOOP_HEAPSIZE={{hive_heapsize}} # Setting for HiveServer2 and Client
-      fi
-
-      export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS  -Xmx${HADOOP_HEAPSIZE}m"
-
-      # Larger heap size may be required when running queries over large number of files or partitions.
-      # By default hive shell scripts use a heap size of 256 (MB).  Larger heap size would also be
-      # appropriate for hive server (hwi etc).
-
-
-      # Set HADOOP_HOME to point to a specific hadoop install directory
-      HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}
-
-      # Hive Configuration Directory can be controlled by:
-      export HIVE_CONF_DIR={{hive_server_interactive_conf_dir}}
-
-      # Add additional hcatalog jars
-      if [ "${HIVE_AUX_JARS_PATH}" != "" ]; then
-      export HIVE_AUX_JARS_PATH=${HIVE_AUX_JARS_PATH}
-      else
-      export HIVE_AUX_JARS_PATH=/usr/hdp/current/hive-server2-hive2/lib/hive-hcatalog-core.jar
-      fi
-
-      export METASTORE_PORT={{hive_metastore_port}}
-
-      # Spark assembly contains a conflicting copy of HiveConf from hive-1.2
-      export HIVE_SKIP_SPARK_ASSEMBLY=true
-
-    </value>
-    <description>This is the jinja template for hive-env.sh file</description>
-    <display-name>hive-interactive-env template</display-name>
-    <filename>hive-interactive-env.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>content</type>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-interactive-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-interactive-site.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-interactive-site.xml
deleted file mode 100755
index 27d3541..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-interactive-site.xml
+++ /dev/null
@@ -1,909 +0,0 @@
-<configuration><property require-input="false">
-    <name>hive.server2.thrift.port</name>
-    <value>10500</value>
-    <description>
-      TCP port number to listen on, default 10500.
-    </description>
-    <display-name>HiveServer2 Port</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-        <overridable>false</overridable>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.server2.thrift.http.port</name>
-    <value>10501</value>
-    <description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'http'.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.server2.tez.sessions.per.default.queue</name>
-    <value>1</value>
-    <description>
-      The maximum number of queries the Hive Interactive cluster will be able to handle concurrently.
-    </description>
-    <display-name>Maximum Total Concurrent Queries</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-        <maximum>10</maximum>
-        <minimum>1</minimum>
-        <increment-step>1</increment-step>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-        <property>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-    </depends-on>
-    <property_depended_by>
-        <dependedByProperties>
-            <name>hive.llap.daemon.num.executors</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>llap_heap_size</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>tez.am.resource.memory.mb</name>
-            <type>tez-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.daemon.yarn.container.mb</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.io.memory.size</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>num_llap_nodes</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>slider_am_container_mb</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-    </property_depended_by>
-</property><property require-input="false">
-    <name>hive.metastore.uris</name>
-    <value></value>
-    <description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.server2.enable.doAs</name>
-    <value>false</value>
-    <description>
-      Setting this property to true will have HiveServer2 execute
-      Hive operations as the user making the calls to it.
-    </description>
-    <display-name>Run as end user instead of Hive user</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>value-list</type>
-        <entries>
-            <entry>
-                <value>true</value>
-                <label>True</label>
-            </entry>
-            <entry>
-                <value>false</value>
-                <label>False</label>
-            </entry>
-        </entries>
-        <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>hive_security_authorization</name>
-            <type>hive-env</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.prewarm.enabled</name>
-    <value>false</value>
-    <description>Enables container prewarm for Tez (Hadoop 2 only)</description>
-    <display-name>Hold Containers to Reduce Latency</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>value-list</type>
-        <entries>
-            <entry>
-                <value>true</value>
-                <label>True</label>
-            </entry>
-            <entry>
-                <value>false</value>
-                <label>False</label>
-            </entry>
-        </entries>
-        <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.vectorized.execution.reduce.enabled</name>
-    <value>true</value>
-    <description>
-      This flag should be set to true to enable vectorized mode of the reduce-side of
-      query execution.
-    </description>
-    <display-name>Enable Reduce Vectorization</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>value-list</type>
-        <entries>
-            <entry>
-                <value>true</value>
-                <label>True</label>
-            </entry>
-            <entry>
-                <value>false</value>
-                <label>False</label>
-            </entry>
-        </entries>
-        <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.server2.tez.default.queues</name>
-    <value>default</value>
-    <description>
-      A list of comma separated values corresponding to YARN queues of the same name.
-      When HiveServer2 is launched in Tez mode, this configuration needs to be set
-      for multiple Tez sessions to run in parallel on the cluster.
-    </description>
-    <display-name>Default query queues</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>combo</type>
-        <entries>
-            <entry>
-                <value>default</value>
-                <label>Default</label>
-            </entry>
-        </entries>
-        <selection-cardinality>1+</selection-cardinality>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.server2.tez.initialize.default.sessions</name>
-    <value>true</value>
-    <description>
-      This flag is used in HiveServer2 to enable a user to use HiveServer2 without
-      turning on Tez for HiveServer2. The user could potentially want to run queries
-      over Tez without the pool of sessions.
-    </description>
-    <display-name>Start Tez session at Initialization</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>value-list</type>
-        <entries>
-            <entry>
-                <value>true</value>
-                <label>True</label>
-            </entry>
-            <entry>
-                <value>false</value>
-                <label>False</label>
-            </entry>
-        </entries>
-        <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.driver.parallel.compilation</name>
-    <value>true</value>
-    <description>
-      This flag allows HiveServer2 to compile queries in parallel.
-    </description>
-    <display-name>Compile queries in parallel</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>value-list</type>
-        <entries>
-            <entry>
-                <value>true</value>
-                <label>True</label>
-            </entry>
-            <entry>
-                <value>false</value>
-                <label>False</label>
-            </entry>
-        </entries>
-        <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.server2.webui.port</name>
-    <value>10502</value>
-    <description>Web UI port address</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.server2.webui.use.ssl</name>
-    <value>false</value>
-    <description>Enable SSL for HiveServer2 Interactive</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.server2.zookeeper.namespace</name>
-    <value>hiveserver2-hive2</value>
-    <description>The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.daemon.queue.name</name>
-    <value>default</value>
-    <description>Choose the YARN queue in this cluster that is dedicated to interactive query.</description>
-    <display-name>Interactive Query Queue</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>combo</type>
-        <entries>
-            <entry>
-                <value>default</value>
-                <label>Default</label>
-            </entry>
-        </entries>
-        <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-    </depends-on>
-    <property_depended_by>
-        <dependedByProperties>
-            <name>hive.server2.tez.default.queues</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.daemon.num.executors</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>llap_heap_size</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>tez.am.resource.memory.mb</name>
-            <type>tez-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.daemon.yarn.container.mb</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>hive.llap.io.memory.size</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>num_llap_nodes</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-        <dependedByProperties>
-            <name>slider_am_container_mb</name>
-            <type>hive-interactive-env</type>
-        </dependedByProperties>
-    </property_depended_by>
-</property><property require-input="false">
-    <name>hive.llap.daemon.yarn.shuffle.port</name>
-    <value>15551</value>
-    <description>YARN shuffle port for LLAP-daemon-hosted shuffle.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.execution.engine</name>
-    <value>tez</value>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.execution.mode</name>
-    <value>llap</value>
-    <description>Chooses whether query fragments will run in container or in llap</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.execution.mode</name>
-    <value>all</value>
-    <description>Chooses which fragments of a query will run in llap</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.io.enabled</name>
-    <value>true</value>
-    <description>Whether the LLAP IO layer is enabled.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on>
-        <property>
-            <name>hive.llap.io.memory.size</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.io.use.lrfu</name>
-    <value>true</value>
-    <description>Whether ORC low-level cache should use LRFU cache policy instead of default (FIFO).</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.auto.allow.uber</name>
-    <value>false</value>
-    <description>Whether or not to allow the planner to run vertices in the AM.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.object.cache.enabled</name>
-    <value>true</value>
-    <description>Cache objects (plans, hashtables, etc) in llap</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.tez.input.generate.consistent.splits</name>
-    <value>true</value>
-    <description>Whether to generate consistent split locations when generating splits in the AM</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.client.consistent.splits</name>
-    <value>true</value>
-    <description>
-      Whether to setup split locations to match nodes on which llap daemons are running,
-      instead of using the locations provided by the split itself.
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.task.scheduler.locality.delay</name>
-    <value>-1</value>
-    <description>
-      Amount of time to wait before allocating a request which contains location information,
-      to a location other than the ones requested. Set to -1 for an infinite delay, 0
-      for no delay.
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.exec.orc.split.strategy</name>
-    <value>HYBRID</value>
-    <description>
-      This is not a user level config. BI strategy is used when the requirement is to spend less time in split generation
-      as opposed to query execution (split generation does not read or cache file footers).
-      ETL strategy is used when spending little more time in split generation is acceptable
-      (split generation reads and caches file footers). HYBRID chooses between the above strategies
-      based on heuristics.
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.daemon.service.hosts</name>
-    <value>@llap0</value>
-    <description>
-      Explicitly specified hosts to use for LLAP scheduling. Useful for testing. By default,
-      YARN registry is used.
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.daemon.allow.permanent.fns</name>
-    <value>false</value>
-    <description>Whether LLAP daemon should localize the resources for permanent UDFs.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.io.memory.size</name>
-    <value>0</value>
-    <description>The amount of memory reserved for Hive's optimized in-memory cache.</description>
-    <display-name>In-Memory Cache per Daemon</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-        <unit>MB</unit>
-        <overridable>false</overridable>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>tez.am.resource.memory.mb</name>
-            <type>tez-site</type>
-        </property>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-        <property>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by>
-        <dependedByProperties>
-            <name>hive.llap.io.enabled</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-    </property_depended_by>
-</property><property require-input="false">
-    <name>hive.llap.daemon.num.executors</name>
-    <value>1</value>
-    <description>The maximum number of CPUs a single LLAP daemon will use. Usually this should be equal to the number of available CPUs.</description>
-    <display-name>Maximum CPUs per Daemon</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>tez.am.resource.memory.mb</name>
-            <type>tez-site</type>
-        </property>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-        <property>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by>
-        <dependedByProperties>
-            <name>hive.llap.io.threadpool.size</name>
-            <type>hive-interactive-site</type>
-        </dependedByProperties>
-    </property_depended_by>
-</property><property require-input="false">
-    <name>hive.llap.daemon.vcpus.per.instance</name>
-    <value>${hive.llap.daemon.num.executors}</value>
-    <description>The total number of vcpus to use for the executors inside LLAP.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.daemon.yarn.container.mb</name>
-    <value>341</value>
-    <description>Total memory used by individual LLAP daemons. This includes memory for the cache as well as for the query execution.</description>
-    <display-name>Memory per daemon</display-name>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>int</type>
-        <unit>MB</unit>
-        <overridable>false</overridable>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>yarn.scheduler.capacity.root.queues</name>
-            <type>capacity-scheduler</type>
-        </property>
-        <property>
-            <name>hive.llap.daemon.queue.name</name>
-            <type>hive-interactive-site</type>
-        </property>
-        <property>
-            <name>llap_queue_capacity</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>enable_hive_interactive</name>
-            <type>hive-interactive-env</type>
-        </property>
-        <property>
-            <name>hive.server2.tez.sessions.per.default.queue</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>llap.shuffle.connection-keep-alive.enable</name>
-    <value>true</value>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>llap.shuffle.connection-keep-alive.timeout</name>
-    <value>60</value>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.io.threadpool.size</name>
-    <value>2</value>
-    <description>Specify the number of threads to use for low-level IO thread pool.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on>
-        <property>
-            <name>hive.llap.daemon.num.executors</name>
-            <type>hive-interactive-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.daemon.rpc.port</name>
-    <value>15001</value>
-    <description>The LLAP daemon RPC port.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.management.rpc.port</name>
-    <value>15004</value>
-    <description>RPC port for LLAP daemon management service.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.daemon.task.scheduler.enable.preemption</name>
-    <value>true</value>
-    <description>hive.llap.daemon.task.scheduler.enable.preemption</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.tez.exec.print.summary</name>
-    <value>true</value>
-    <description>Display breakdown of execution steps, for every query executed by the shell.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.vectorized.execution.mapjoin.native.enabled</name>
-    <value>true</value>
-    <description>
-      This flag should be set to true to enable native (i.e. non-pass through) vectorization
-      of queries using MapJoin.
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.vectorized.execution.mapjoin.minmax.enabled</name>
-    <value>true</value>
-    <description>
-      This flag should be set to true to enable vector map join hash tables to
-      use max / max filtering for integer join queries using MapJoin.
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.vectorized.execution.mapjoin.native.fast.hashtable.enabled</name>
-    <value>true</value>
-    <description>
-      This flag should be set to true to enable use of native fast vector map join hash tables in
-      queries using MapJoin.
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.mapjoin.hybridgrace.hashtable</name>
-    <value>false</value>
-    <description>Whether to use hybrid grace hash join as the join method for mapjoin. Tez only.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.tez.bucket.pruning</name>
-    <value>true</value>
-    <description>
-      When pruning is enabled, filters on bucket columns will be processed by
-      filtering the splits against a bitset of included buckets. This needs predicates
-      produced by hive.optimize.ppd and hive.optimize.index.filters.
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.optimize.dynamic.partition.hashjoin</name>
-    <value>true</value>
-    <description>
-      Whether to enable dynamically partitioned hash join optimization.
-      This setting is also dependent on enabling hive.auto.convert.join
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.zk.sm.connectionString</name>
-    <value>localhost:2181</value>
-    <description>ZooKeeper connection string for ZooKeeper SecretManager.</description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on>
-        <property>
-            <name>clientPort</name>
-            <type>zoo.cfg</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.llap.io.memory.mode</name>
-    <value></value>
-    <description>
-      LLAP IO memory usage; 'cache' (the default) uses data and metadata cache with a
-      custom off-heap allocator, 'allocator' uses the custom allocator without the caches,
-      'none' doesn't use either (this mode may result in significant performance degradation)
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.metastore.event.listeners</name>
-    <value></value>
-    <description>
-      Listeners for metastore events
-    </description>
-    <filename>hive-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-log4j2.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-log4j2.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-log4j2.xml
deleted file mode 100755
index 798063b..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hive-log4j2.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<configuration><property require-input="false">
-    <name>content</name>
-    <value>
-# 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.
-
-status = INFO
-name = HiveLog4j2
-packages = org.apache.hadoop.hive.ql.log
-
-# list of properties
-property.hive.log.level = INFO
-property.hive.root.logger = DRFA
-property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
-property.hive.log.file = hive.log
-
-# list of all appenders
-appenders = console, DRFA
-
-# console appender
-appender.console.type = Console
-appender.console.name = console
-appender.console.target = SYSTEM_ERR
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
-
-# daily rolling file appender
-appender.DRFA.type = RollingFile
-appender.DRFA.name = DRFA
-appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
-# Use %pid in the filePattern to append process-id@host-name to the filename if you want separate log files for different CLI session
-appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}.gz
-appender.DRFA.layout.type = PatternLayout
-appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n
-appender.DRFA.policies.type = Policies
-appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
-appender.DRFA.policies.time.interval = 1
-appender.DRFA.policies.time.modulate = true
-appender.DRFA.strategy.type = DefaultRolloverStrategy
-appender.DRFA.strategy.max = 30
-
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
-
-logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
-logger.NIOServerCnxn.level = WARN
-
-logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
-logger.ClientCnxnSocketNIO.level = WARN
-
-logger.DataNucleus.name = DataNucleus
-logger.DataNucleus.level = ERROR
-
-logger.Datastore.name = Datastore
-logger.Datastore.level = ERROR
-
-logger.JPOX.name = JPOX
-logger.JPOX.level = ERROR
-
-# root logger
-rootLogger.level = ${sys:hive.log.level}
-rootLogger.appenderRefs = root
-rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}
-  </value>
-    <description>Custom hive-log4j2.properties</description>
-    <display-name>hive-log4j2 template</display-name>
-    <filename>hive-log4j2.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>content</type>
-        <show-property-name>false</show-property-name>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hiveserver2-interactive-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hiveserver2-interactive-site.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hiveserver2-interactive-site.xml
deleted file mode 100755
index 6954e56..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/hiveserver2-interactive-site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<configuration><property require-input="false">
-    <name>hive.metastore.metrics.enabled</name>
-    <value>true</value>
-    <filename>hiveserver2-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>boolean</type>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.service.metrics.reporter</name>
-    <value>JSON_FILE, JMX, HADOOP2</value>
-    <filename>hiveserver2-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.service.metrics.hadoop2.component</name>
-    <value>hiveserver2</value>
-    <filename>hiveserver2-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.service.metrics.file.location</name>
-    <value>/var/log/hive/hiveserver2Interactive-report.json</value>
-    <filename>hiveserver2-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>hive.async.log.enabled</name>
-    <value>false</value>
-    <description>Whether to enable Log4j2's asynchronous logging. Asynchronous logging can give significant performance improvement as logging will be handled in separate thread that uses LMAX disruptor queue for buffering log messages. Refer https://logging.apache.org/log4j/2.x/manual/async.html for benefits and drawbacks.</description>
-    <filename>hiveserver2-interactive-site.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>boolean</type>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/llap-cli-log4j2.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/llap-cli-log4j2.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/llap-cli-log4j2.xml
deleted file mode 100755
index b7f6523..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/llap-cli-log4j2.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<configuration><property require-input="false">
-    <name>content</name>
-    <value>
-# 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.
-
-status = WARN
-name = LlapCliLog4j2
-packages = org.apache.hadoop.hive.ql.log
-
-# list of properties
-property.hive.log.level = INFO
-property.hive.root.logger = console
-property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
-property.hive.log.file = llap-cli.log
-
-# list of all appenders
-appenders = console, DRFA
-
-# console appender
-appender.console.type = Console
-appender.console.name = console
-appender.console.target = SYSTEM_ERR
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %p %c{2}: %m%n
-
-# daily rolling file appender
-appender.DRFA.type = RollingRandomAccessFile
-appender.DRFA.name = DRFA
-appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
-# Use %pid in the filePattern to append process-id@host-name to the filename if you want separate log files for different CLI session
-appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}
-appender.DRFA.layout.type = PatternLayout
-appender.DRFA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n
-appender.DRFA.policies.type = Policies
-appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
-appender.DRFA.policies.time.interval = 1
-appender.DRFA.policies.time.modulate = true
-appender.DRFA.strategy.type = DefaultRolloverStrategy
-appender.DRFA.strategy.max = 30
-
-# list of all loggers
-loggers = ZooKeeper, DataNucleus, Datastore, JPOX, HadoopConf
-
-logger.ZooKeeper.name = org.apache.zookeeper
-logger.ZooKeeper.level = WARN
-
-logger.DataNucleus.name = DataNucleus
-logger.DataNucleus.level = ERROR
-
-logger.Datastore.name = Datastore
-logger.Datastore.level = ERROR
-
-logger.JPOX.name = JPOX
-logger.JPOX.level = ERROR
-
-logger.HadoopConf.name = org.apache.hadoop.conf.Configuration
-logger.HadoopConf.level = ERROR
-
-# root logger
-rootLogger.level = ${sys:hive.log.level}
-rootLogger.appenderRefs = root, DRFA
-rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}
-rootLogger.appenderRef.DRFA.ref = DRFA
-  </value>
-    <description>Custom llap-cli-log4j2.properties</description>
-    <display-name>llap-cli-log4j2 template</display-name>
-    <filename>llap-cli-log4j2.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>content</type>
-        <show-property-name>false</show-property-name>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/llap-daemon-log4j.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/llap-daemon-log4j.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/llap-daemon-log4j.xml
deleted file mode 100755
index 30c31be..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/llap-daemon-log4j.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<configuration><property require-input="false">
-    <name>content</name>
-    <value>
-# 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.
-
-
-# This is the log4j2 properties file used by llap-daemons. There's several loggers defined, which
-# can be selected while configuring LLAP.
-# Based on the one selected - UI links etc need to be manipulated in the system.
-# Note: Some names and logic is common to this file and llap LogHelpers. Make sure to change that
-# as well, if changing this file.
-
-status = INFO
-name = LlapDaemonLog4j2
-packages = org.apache.hadoop.hive.ql.log
-
-# list of properties
-property.llap.daemon.log.level = INFO
-property.llap.daemon.root.logger = console
-property.llap.daemon.log.dir = .
-property.llap.daemon.log.file = llapdaemon.log
-property.llap.daemon.historylog.file = llapdaemon_history.log
-property.llap.daemon.log.maxfilesize = 256MB
-property.llap.daemon.log.maxbackupindex = 240
-
-# list of all appenders
-appenders = console, RFA, HISTORYAPPENDER, query-routing
-
-# console appender
-appender.console.type = Console
-appender.console.name = console
-appender.console.target = SYSTEM_ERR
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} %5p [%t (%X{fragmentId})] %c{2}: %m%n
-
-# rolling file appender
-appender.RFA.type = RollingRandomAccessFile
-appender.RFA.name = RFA
-appender.RFA.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}
-appender.RFA.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}_%d{yyyy-MM-dd-HH}_%i.done
-appender.RFA.layout.type = PatternLayout
-appender.RFA.layout.pattern = %d{ISO8601} %-5p [%t (%X{fragmentId})] %c: %m%n
-appender.RFA.policies.type = Policies
-appender.RFA.policies.time.type = TimeBasedTriggeringPolicy
-appender.RFA.policies.time.interval = 1
-appender.RFA.policies.time.modulate = true
-appender.RFA.policies.size.type = SizeBasedTriggeringPolicy
-appender.RFA.policies.size.size = ${sys:llap.daemon.log.maxfilesize}
-appender.RFA.strategy.type = DefaultRolloverStrategy
-appender.RFA.strategy.max = ${sys:llap.daemon.log.maxbackupindex}
-
-# history file appender
-appender.HISTORYAPPENDER.type = RollingRandomAccessFile
-appender.HISTORYAPPENDER.name = HISTORYAPPENDER
-appender.HISTORYAPPENDER.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}
-appender.HISTORYAPPENDER.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}_%d{yyyy-MM-dd}_%i.done
-appender.HISTORYAPPENDER.layout.type = PatternLayout
-appender.HISTORYAPPENDER.layout.pattern = %m%n
-appender.HISTORYAPPENDER.policies.type = Policies
-appender.HISTORYAPPENDER.policies.size.type = SizeBasedTriggeringPolicy
-appender.HISTORYAPPENDER.policies.size.size = ${sys:llap.daemon.log.maxfilesize}
-appender.HISTORYAPPENDER.policies.time.type = TimeBasedTriggeringPolicy
-appender.HISTORYAPPENDER.policies.time.interval = 1
-appender.HISTORYAPPENDER.policies.time.modulate = true
-appender.HISTORYAPPENDER.strategy.type = DefaultRolloverStrategy
-appender.HISTORYAPPENDER.strategy.max = ${sys:llap.daemon.log.maxbackupindex}
-
-# queryId based routing file appender
-appender.query-routing.type = Routing
-appender.query-routing.name = query-routing
-appender.query-routing.routes.type = Routes
-appender.query-routing.routes.pattern = $${ctx:queryId}
-#Purge polciy for query-based Routing Appender
-appender.query-routing.purgePolicy.type = LlapRoutingAppenderPurgePolicy
-# Note: Do not change this name without changing the corresponding entry in LlapConstants
-appender.query-routing.purgePolicy.name = llapLogPurgerQueryRouting
-# default route
-appender.query-routing.routes.route-default.type = Route
-appender.query-routing.routes.route-default.key = $${ctx:queryId}
-appender.query-routing.routes.route-default.ref = RFA
-# queryId based route
-appender.query-routing.routes.route-mdc.type = Route
-appender.query-routing.routes.route-mdc.file-mdc.type = LlapWrappedAppender
-appender.query-routing.routes.route-mdc.file-mdc.name = IrrelevantName-query-routing
-appender.query-routing.routes.route-mdc.file-mdc.app.type = RandomAccessFile
-appender.query-routing.routes.route-mdc.file-mdc.app.name = file-mdc
-appender.query-routing.routes.route-mdc.file-mdc.app.fileName = ${sys:llap.daemon.log.dir}/${ctx:queryId}-${ctx:dagId}.log
-appender.query-routing.routes.route-mdc.file-mdc.app.layout.type = PatternLayout
-appender.query-routing.routes.route-mdc.file-mdc.app.layout.pattern = %d{ISO8601} %5p [%t (%X{fragmentId})] %c{2}: %m%n
-
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX, HistoryLogger, LlapIoImpl, LlapIoOrc, LlapIoCache, LlapIoLocking
-
-logger.LlapIoImpl.name = LlapIoImpl
-logger.LlapIoImpl.level = INFO
-
-logger.LlapIoOrc.name = LlapIoOrc
-logger.LlapIoOrc.level = WARN
-
-logger.LlapIoCache.name = LlapIoCache
-logger.LlapIOCache.level = WARN
-
-logger.LlapIoLocking.name = LlapIoLocking
-logger.LlapIoLocking.level = WARN
-
-logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
-logger.NIOServerCnxn.level = WARN
-
-logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
-logger.ClientCnxnSocketNIO.level = WARN
-
-logger.DataNucleus.name = DataNucleus
-logger.DataNucleus.level = ERROR
-
-logger.Datastore.name = Datastore
-logger.Datastore.level = ERROR
-
-logger.JPOX.name = JPOX
-logger.JPOX.level = ERROR
-
-logger.HistoryLogger.name = org.apache.hadoop.hive.llap.daemon.HistoryLogger
-logger.HistoryLogger.level = INFO
-logger.HistoryLogger.additivity = false
-logger.HistoryLogger.appenderRefs = HistoryAppender
-logger.HistoryLogger.appenderRef.HistoryAppender.ref = HISTORYAPPENDER
-
-# root logger
-rootLogger.level = ${sys:llap.daemon.log.level}
-rootLogger.appenderRefs = root
-rootLogger.appenderRef.root.ref = ${sys:llap.daemon.root.logger}
-  </value>
-    <description>Custom llap-daemon-log4j2.properties</description>
-    <display-name>llap-deamon-log4j template</display-name>
-    <filename>llap-daemon-log4j.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="true" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>content</type>
-        <show-property-name>false</show-property-name>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/bigtop/blob/b6475d77/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-audit.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-audit.xml
deleted file mode 100755
index 9e74aa0..0000000
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-audit.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<configuration><property require-input="false">
-    <name>xasecure.audit.is.enabled</name>
-    <value>true</value>
-    <description>Is Audit enabled?</description>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>xasecure.audit.destination.hdfs</name>
-    <value>true</value>
-    <description>Is Audit to HDFS enabled?</description>
-    <display-name>Audit to HDFS</display-name>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>xasecure.audit.destination.hdfs</name>
-            <type>ranger-env</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>xasecure.audit.destination.hdfs.dir</name>
-    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
-    <description>HDFS folder to write audit to, make sure the service user has requried permissions</description>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on>
-        <property>
-            <name>xasecure.audit.destination.hdfs.dir</name>
-            <type>ranger-env</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
-    <value>/var/log/hive/audit/hdfs/spool</value>
-    <description>/var/log/hive/audit/hdfs/spool</description>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>xasecure.audit.destination.solr</name>
-    <value>false</value>
-    <description>Is Solr audit enabled?</description>
-    <display-name>Audit to SOLR</display-name>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>xasecure.audit.destination.solr</name>
-            <type>ranger-env</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>xasecure.audit.destination.solr.urls</name>
-    <value></value>
-    <description>Solr URL</description>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-        <property>
-            <name>ranger.audit.solr.urls</name>
-            <type>ranger-admin-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>xasecure.audit.destination.solr.zookeepers</name>
-    <value>NONE</value>
-    <description>Solr Zookeeper string</description>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on>
-        <property>
-            <name>ranger.audit.solr.zookeepers</name>
-            <type>ranger-admin-site</type>
-        </property>
-    </depends-on>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
-    <value>/var/log/hive/audit/solr/spool</value>
-    <description>/var/log/hive/audit/solr/spool</description>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes/>
-    <depends-on/>
-    <property_depended_by/>
-</property><property require-input="false">
-    <name>xasecure.audit.provider.summary.enabled</name>
-    <value>false</value>
-    <description>Enable Summary audit?</description>
-    <display-name>Audit provider summary enabled</display-name>
-    <filename>ranger-hive-audit.xml</filename>
-    <deleted>false</deleted>
-    <on-ambari-upgrade add="false" delete="false" update="false"/>
-    <property-type></property-type>
-    <value-attributes>
-        <type>boolean</type>
-    </value-attributes>
-    <depends-on/>
-    <property_depended_by/>
-</property></configuration>
\ No newline at end of file


Mime
View raw message