ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-18351. Preserve output while executing HSI/LLAP's run.sh command for launching LLAP.
Date Tue, 13 Sep 2016 23:08:25 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 72617ce73 -> 627c1b48c


AMBARI-18351. Preserve output while executing HSI/LLAP's run.sh command for launching LLAP.


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

Branch: refs/heads/branch-2.5
Commit: 627c1b48ccf94d32396f9ba3061fa01221848d28
Parents: 72617ce
Author: Swapan Shridhar <sshridhar@hortonworks.com>
Authored: Mon Sep 12 11:27:18 2016 -0700
Committer: Swapan Shridhar <sshridhar@hortonworks.com>
Committed: Tue Sep 13 16:04:34 2016 -0700

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py   | 2 +-
 .../src/test/python/stacks/2.5/HIVE/test_hive_server_int.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/627c1b48/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 2df001c..673f559 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
@@ -297,7 +297,7 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
           raise Fail("Did not find run.sh file in output: " + str(output))
 
         Logger.info(format("Run file path: {run_file_path}"))
-        Execute(run_file_path, user=params.hive_user)
+        Execute(run_file_path, user=params.hive_user, logoutput=True)
         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

http://git-wip-us.apache.org/repos/asf/ambari/blob/627c1b48/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
index 389e45d..b97c377 100644
--- a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
+++ b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
@@ -106,7 +106,7 @@ class TestHiveServerInteractive(RMFTestCase):
 
     self.assertResourceCalled('Execute',
                               '/home/hive/llap-slider-05Apr2016/run.sh',
-                              user='hive'
+                              logoutput= True, user=u'hive'
     )
     self.assertResourceCalled('Execute',
                               'hive --config /usr/hdp/current/hive-server2-hive2/conf/conf.server
--service metatool -updateLocation hdfs://c6401.ambari.apache.org:8020 OK.',
@@ -164,7 +164,7 @@ class TestHiveServerInteractive(RMFTestCase):
 
     self.assertResourceCalled('Execute',
                               '/home/hive/llap-slider-05Apr2016/run.sh',
-                              user='hive'
+                              logoutput= True, user=u'hive'
                               )
     self.assertResourceCalled('Execute',
                               'hive --config /usr/hdp/current/hive-server2-hive2/conf/conf.server
--service metatool -updateLocation hdfs://c6401.ambari.apache.org:8020 OK.',


Mime
View raw message