Browse Source

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

Swapan Shridhar 9 years ago
parent
commit
627c1b48cc

+ 1 - 1
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

+ 2 - 2
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.',