ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [18/22] ambari git commit: AMBARI-20947. Use keytab file named 'hive.service.keytab' instead of 'hive.llap.zk.sm.keytab' in hive_server_interactive.py for copying to slider.
Date Mon, 08 May 2017 14:03:09 GMT
AMBARI-20947. Use keytab file named 'hive.service.keytab' instead of 'hive.llap.zk.sm.keytab'
in hive_server_interactive.py for copying to slider.


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 569a1bbb6dd7753133c933e684759b5a9e535289
Parents: 0abfb35
Author: Swapan Shridhar <sshridhar@hortonworks.com>
Authored: Fri May 5 15:28:42 2017 -0700
Committer: Swapan Shridhar <sshridhar@hortonworks.com>
Committed: Sat May 6 00:59:44 2017 -0700

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py   | 4 ++--
 .../0.12.0.2.0/package/scripts/hive_server_interactive.py     | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/569a1bbb/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py
index 095be3f..98d1899 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_llap_app_status.py
@@ -47,10 +47,10 @@ UKNOWN_STATUS_CODE = 'UNKNOWN'
 
 SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
 
-HIVE_PRINCIPAL_KEY = '{{hive-interactive-site/hive.llap.zk.sm.principal}}'
+HIVE_PRINCIPAL_KEY = '{{hive-interactive-site/hive.llap.daemon.service.principal}}'
 HIVE_PRINCIPAL_DEFAULT = 'default.hive.principal'
 
-HIVE_PRINCIPAL_KEYTAB_KEY = '{{hive-interactive-site/hive.llap.zk.sm.keytab.file}}'
+HIVE_PRINCIPAL_KEYTAB_KEY = '{{hive-interactive-site/hive.llap.daemon.keytab.file}}'
 HIVE_PRINCIPAL_KEYTAB_DEFAULT = 'default.hive.keytab'
 
 HIVE_AUTHENTICATION_DEFAULT = 'NOSASL'

http://git-wip-us.apache.org/repos/asf/ambari/blob/569a1bbb/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 8f57f1e..9c970de 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
@@ -355,8 +355,8 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
 
       self.do_kinit()
 
-      # Copy params.hive_llap_keytab_file to hdfs://<host>:<port>/user/<hive_user>/.slider/keytabs/<hive_user>
, required by LLAP
-      slider_keytab_install_cmd = format("slider install-keytab --keytab {params.hive_llap_keytab_file}
--folder {params.hive_user} --overwrite")
+      # Copy params.hive.service.keytab to hdfs://<host>:<port>/user/<hive_user>/.slider/keytabs/<hive_user>
, required by LLAP
+      slider_keytab_install_cmd = format("slider install-keytab --keytab {params.hive_server2_keytab}
--folder {params.hive_user} --overwrite")
       Execute(slider_keytab_install_cmd, user=params.hive_user)
 
     def do_kinit(self):
@@ -365,9 +365,6 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
       hive_interactive_kinit_cmd = format("{kinit_path_local} -kt {params.hive_server2_keytab}
{params.hive_principal}; ")
       Execute(hive_interactive_kinit_cmd, user=params.hive_user)
 
-      llap_kinit_cmd = format("{kinit_path_local} -kt {params.hive_llap_keytab_file} {params.hive_llap_principal};
")
-      Execute(llap_kinit_cmd, user=params.hive_user)
-
     """
     Get llap app status data for LLAP Tech Preview code base.
     """


Mime
View raw message