Repository: ambari Updated Branches: refs/heads/trunk 2816fc229 -> e1cf8db0d
AMBARI-16112. Removing absolute path for LLAP keytab file (hive.llap.zk.sm.keytab) while creating LLAP slider package. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1cf8db0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1cf8db0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1cf8db0 Branch: refs/heads/trunk Commit: e1cf8db0d568b3ffbc25bb8dcb6a591399ad5eb4 Parents: 2816fc2 Author: Swapan Shridhar <[email protected]> Authored: Tue Apr 26 01:41:18 2016 -0700 Committer: Swapan Shridhar <[email protected]> Committed: Tue Apr 26 10:43:34 2016 -0700 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e1cf8db0/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 6bf4c0a..5fdd7fc 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 @@ -115,7 +115,7 @@ class HiveServerInteractiveDefault(HiveServerInteractive): # TODO, why does LLAP have to be started before Hive Server Interactive??? status = self._llap_start(env) if not status: - raise Fail("Skipping start of Hive Server Interactive since could not start LLAP.") + raise Fail("Skipping START of Hive Server Interactive since LLAP app couldn't be STARTED.") # TODO : test the workability of Ranger and Hive2 during upgrade # setup_ranger_hive(upgrade_type=upgrade_type) @@ -212,8 +212,10 @@ class HiveServerInteractiveDefault(HiveServerInteractive): " --cache {params.hive_llap_io_mem_size}m --xmx {params.llap_heap_size}m --loglevel {params.llap_log_level}" " --output {unique_name}") if params.security_enabled: + llap_keytab_splits = params.hive_llap_keytab_file.split("/") + Logger.debug("llap_keytab_splits : {0}".format(llap_keytab_splits)) cmd += format(" --slider-keytab-dir .slider/keytabs/{params.hive_user}/ --slider-keytab " - "{hive_llap_keytab_file} --slider-principal {hive_headless_keytab}") + "{llap_keytab_splits[4]} --slider-principal {hive_headless_keytab}") run_file_path = None try:
