ソースを参照

AMBARI-9595. Ambari greps 'running' for service daemon status, which does not apply to certain services/platforms (aonishuk)

Andrew Onishuk 10 年 前
コミット
f95eb95295

+ 1 - 1
ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py

@@ -22,7 +22,7 @@ from resource_management import *
 
 
 def mysql_service(daemon_name=None, action='start'): 
-  status_cmd = format('service {daemon_name} status | grep running')
+  status_cmd = format("pgrep -l '^{daemon_name}$'")
   cmd = ('service', daemon_name, action)
 
   if action == 'status':

+ 4 - 4
ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py

@@ -46,7 +46,7 @@ class TestMySqlServer(RMFTestCase):
 
     self.assertResourceCalled('Execute', ('service','mysql','start'),
                        logoutput = True,
-                       not_if = 'service mysql status | grep running',
+                       not_if = 'pgrep -l \'^mysql$\'',
                        sudo = True,
     )
     self.assertNoMoreResources()
@@ -61,7 +61,7 @@ class TestMySqlServer(RMFTestCase):
     )
     self.assertResourceCalled('Execute', ('service','mysql','stop'),
                               logoutput = True,
-                              only_if = 'service mysql status | grep running',
+                              only_if = 'pgrep -l \'^mysql$\'',
                               sudo = True,
     )
     self.assertNoMoreResources()
@@ -89,7 +89,7 @@ class TestMySqlServer(RMFTestCase):
 
     self.assertResourceCalled('Execute', ('service','mysql','start'),
                               logoutput = True,
-                              not_if = 'service mysql status | grep running',
+                              not_if = 'pgrep -l \'^mysql$\'',
                               sudo = True,
                               )
     self.assertNoMoreResources()
@@ -105,7 +105,7 @@ class TestMySqlServer(RMFTestCase):
     
     self.assertResourceCalled('Execute', ('service','mysql','stop'),
                               logoutput = True,
-                              only_if = 'service mysql status | grep running',
+                              only_if = 'pgrep -l \'^mysql$\'',
                               sudo = True,
                               )
     self.assertNoMoreResources()