Преглед изворни кода

AMBARI-12043. Hbase stop fails in non-root agent mode (aonishuk)

Andrew Onishuk пре 10 година
родитељ
комит
f20b5fb684

+ 3 - 2
ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py

@@ -47,5 +47,6 @@ def hbase_service(
         timeout = 30,
         timeout = 30,
         on_timeout = format("! ( {no_op_test} ) || {sudo} -H -E kill -9 `cat {pid_file}`"),
         on_timeout = format("! ( {no_op_test} ) || {sudo} -H -E kill -9 `cat {pid_file}`"),
       )
       )
-      
-      Execute (format("rm -f {pid_file}"))
+      File(pid_file,
+           action = "delete",
+      )

+ 4 - 2
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py

@@ -71,7 +71,8 @@ class TestHBaseMaster(RMFTestCase):
         user = 'hbase',
         user = 'hbase',
     )
     )
     
     
-    self.assertResourceCalled('Execute', 'rm -f /var/run/hbase/hbase-hbase-master.pid',
+    self.assertResourceCalled('File', '/var/run/hbase/hbase-hbase-master.pid',
+        action = ['delete'],
     )
     )
     self.assertNoMoreResources()
     self.assertNoMoreResources()
 
 
@@ -168,7 +169,8 @@ class TestHBaseMaster(RMFTestCase):
         user = 'hbase',
         user = 'hbase',
     )
     )
 
 
-    self.assertResourceCalled('Execute', 'rm -f /var/run/hbase/hbase-hbase-master.pid',
+    self.assertResourceCalled('File', '/var/run/hbase/hbase-hbase-master.pid',
+        action = ['delete'],
     )
     )
     self.assertNoMoreResources()
     self.assertNoMoreResources()
 
 

+ 4 - 2
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py

@@ -71,7 +71,8 @@ class TestHbaseRegionServer(RMFTestCase):
         user = 'hbase',
         user = 'hbase',
     )
     )
     
     
-    self.assertResourceCalled('Execute', 'rm -f /var/run/hbase/hbase-hbase-regionserver.pid',
+    self.assertResourceCalled('File', '/var/run/hbase/hbase-hbase-regionserver.pid',
+        action = ['delete'],
     )
     )
     self.assertNoMoreResources()
     self.assertNoMoreResources()
     
     
@@ -118,7 +119,8 @@ class TestHbaseRegionServer(RMFTestCase):
         user = 'hbase',
         user = 'hbase',
     )
     )
     
     
-    self.assertResourceCalled('Execute', 'rm -f /var/run/hbase/hbase-hbase-regionserver.pid',
+    self.assertResourceCalled('File', '/var/run/hbase/hbase-hbase-regionserver.pid',
+        action = ['delete'],
     )
     )
     self.assertNoMoreResources()
     self.assertNoMoreResources()