ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: AMBARI-8690. Storm service check in secured mode fails (aonishuk)
Date Fri, 12 Dec 2014 19:39:40 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 0ebde089d -> 9338767f2


AMBARI-8690. Storm service check in secured mode fails (aonishuk)


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

Branch: refs/heads/trunk
Commit: 9338767f2d991350701bdedbe24fd47d6d6c03d4
Parents: 0ebde08
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Fri Dec 12 21:39:31 2014 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Fri Dec 12 21:39:31 2014 +0200

----------------------------------------------------------------------
 .../HDP/2.1/services/STORM/package/scripts/service_check.py   | 7 +++++--
 .../src/test/python/stacks/2.1/STORM/test_service_check.py    | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9338767f/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
index b033e99..2661e6f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service_check.py
@@ -36,11 +36,14 @@ class ServiceCheck(Script):
 
     Execute(cmd,
             logoutput=True,
-            path=params.storm_bin_dir
+            path=params.storm_bin_dir,
+            user=params.storm_user
     )
 
     Execute(format("env JAVA_HOME={java64_home} storm kill WordCount{unique}"),
-            path=params.storm_bin_dir)
+            path=params.storm_bin_dir,
+            user=params.storm_user
+    )
 
 if __name__ == "__main__":
   ServiceCheck().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/9338767f/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
index 2ea56f1..c6dda41 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
@@ -38,9 +38,11 @@ class TestStormServiceCheck(RMFTestCase):
     )
     self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 storm jar
/tmp/wordCount.jar storm.starter.WordCountTopology WordCount -c nimbus.host=c6402.ambari.apache.org',
       logoutput = True,
-      path = ['/usr/bin']
+      path = ['/usr/bin'],
+      user = 'storm'
     )
     self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 storm kill
WordCount',
-      path = ['/usr/bin']
+      path = ['/usr/bin'],
+      user = 'storm'
     )
 


Mime
View raw message