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/09/08 18:07:50 UTC

ambari git commit: AMBARI-21916. Shut down LLAP when HSI startup fails.

Repository: ambari
Updated Branches:
  refs/heads/trunk a9d622edb -> 75c8f5ef2


AMBARI-21916. Shut down LLAP when HSI startup fails.


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

Branch: refs/heads/trunk
Commit: 75c8f5ef2374f8d5af01d0e6212053437d3d9f6e
Parents: a9d622e
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Fri Sep 8 10:25:54 2017 -0700
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Fri Sep 8 10:26:06 2017 -0700

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py     | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/75c8f5ef/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 e8e9666..c0b152e 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
@@ -114,6 +114,8 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
       # Start LLAP before Hive Server Interactive start.
       status = self._llap_start(env)
       if not status:
+        # if we couldnt get LLAP in RUNNING or RUNNING_ALL state, stop LLAP process before bailing out.
+        self._llap_stop(env)
         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