You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2017/01/31 20:58:55 UTC

ambari git commit: AMBARI-19687. Set the logger for LLAP in hdp-2.6 stack. (sseth via Swapan Shridhar)

Repository: ambari
Updated Branches:
  refs/heads/trunk 97119babf -> 099e34c60


AMBARI-19687. Set the logger for LLAP in hdp-2.6 stack. (sseth via Swapan Shridhar)


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

Branch: refs/heads/trunk
Commit: 099e34c60540079f86d353efa134ed059a3c3d27
Parents: 97119ba
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Tue Jan 31 12:37:47 2017 -0800
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Tue Jan 31 12:58:51 2017 -0800

----------------------------------------------------------------------
 .../0.12.0.2.0/package/scripts/hive_server_interactive.py    | 3 +++
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py          | 1 +
 .../services/HIVE/configuration/hive-interactive-site.xml    | 8 ++++++++
 3 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/099e34c6/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
index ce10824..1f1d9a8 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
@@ -302,6 +302,9 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
                      "YARN NodeManager Memory({1})".format(params.llap_daemon_container_size, params.yarn_nm_mem))
         cmd += format(" --slider-placement {slider_placement} --skiphadoopversion --skiphbasecp")
 
+        # Setup the logger for the ga version only
+        cmd += format(" --logger {params.llap_logger}")
+
       if params.security_enabled:
         llap_keytab_splits = params.hive_llap_keytab_file.split("/")
         Logger.debug("llap_keytab_splits : {0}".format(llap_keytab_splits))

http://git-wip-us.apache.org/repos/asf/ambari/blob/099e34c6/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 90e4e54..8451de1 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -647,6 +647,7 @@ if has_hive_interactive:
   num_llap_nodes = config['configurations']['hive-interactive-env']['num_llap_nodes']
   llap_daemon_container_size = config['configurations']['hive-interactive-site']['hive.llap.daemon.yarn.container.mb']
   llap_log_level = config['configurations']['hive-interactive-env']['llap_log_level']
+  llap_logger = default('/configurations/hive-interactive-site/hive.llap.daemon.logger', 'query-routing')
   hive_aux_jars = default('/configurations/hive-interactive-env/hive_aux_jars', '')
   hive_llap_io_mem_size = config['configurations']['hive-interactive-site']['hive.llap.io.memory.size']
   llap_heap_size = config['configurations']['hive-interactive-env']['llap_heap_size']

http://git-wip-us.apache.org/repos/asf/ambari/blob/099e34c6/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
index 101de44..befd0f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
@@ -72,4 +72,12 @@ limitations under the License.
     <on-ambari-upgrade add="true"/>
   </property>
 
+  <property>
+    <name>hive.llap.daemon.logger</name>
+    <value>query-routing</value>
+    <description>Logger to be used by LLAP. (query-routing, RFA)</description>
+    <display-name>LLAP logger</display-name>
+    <on-ambari-upgrade add="true"/>
+  </property>
+
 </configuration>