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 2016/06/30 20:52:06 UTC
ambari git commit: AMBARI-17508. Remove the file existence check
(run.sh) after LLAP package creation command.
Repository: ambari
Updated Branches:
refs/heads/trunk 8b0cdcaac -> 725c65130
AMBARI-17508. Remove the file existence check (run.sh) after LLAP package creation command.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/725c6513
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/725c6513
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/725c6513
Branch: refs/heads/trunk
Commit: 725c651305a467797129f1396264116b2e5af43a
Parents: 8b0cdca
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Thu Jun 30 12:05:00 2016 -0700
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Thu Jun 30 13:50:11 2016 -0700
----------------------------------------------------------------------
.../package/scripts/hive_server_interactive.py | 25 +++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/725c6513/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 255396f..bc8a9f0 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
@@ -241,21 +241,18 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
raise Fail("Did not find run.sh file in output: " + str(output))
Logger.info(format("Run file path: {run_file_path}"))
- if os.path.isfile(run_file_path):
- Execute(run_file_path, user=params.hive_user)
- Logger.info("Submitted LLAP app name : {0}".format(LLAP_APP_NAME))
-
- # We need to check the status of LLAP app to figure out it got
- # launched properly and is in running state. Then go ahead with Hive Interactive Server start.
- status = self.check_llap_app_status(LLAP_APP_NAME, params.num_retries_for_checking_llap_status)
- if status:
- Logger.info("LLAP app '{0}' deployed successfully.".format(LLAP_APP_NAME))
- return True
- else:
- Logger.error("LLAP app '{0}' deployment unsuccessful.".format(LLAP_APP_NAME))
- return False
+ Execute(run_file_path, user=params.hive_user)
+ Logger.info("Submitted LLAP app name : {0}".format(LLAP_APP_NAME))
+
+ # We need to check the status of LLAP app to figure out it got
+ # launched properly and is in running state. Then go ahead with Hive Interactive Server start.
+ status = self.check_llap_app_status(LLAP_APP_NAME, params.num_retries_for_checking_llap_status)
+ if status:
+ Logger.info("LLAP app '{0}' deployed successfully.".format(LLAP_APP_NAME))
+ return True
else:
- raise Fail(format("Did not find run file {run_file_path}"))
+ Logger.error("LLAP app '{0}' deployment unsuccessful.".format(LLAP_APP_NAME))
+ return False
except:
# Attempt to clean up the packaged application, or potentially rename it with a .bak
if run_file_path is not None and cleanup: