ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] ambari git commit: AMBARI-12043. Hbase stop fails in non-root agent mode (aonishuk)
Date Sat, 20 Jun 2015 14:27:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 55aafe754 -> 460155d2f
  refs/heads/trunk 5be7a260b -> f20b5fb68


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


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

Branch: refs/heads/trunk
Commit: f20b5fb6843a44eb7b0fba0e719d7b33e1c99ee4
Parents: 5be7a26
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Sat Jun 20 17:27:26 2015 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Sat Jun 20 17:27:26 2015 +0300

----------------------------------------------------------------------
 .../HBASE/0.96.0.2.0/package/scripts/hbase_service.py          | 5 +++--
 .../src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py    | 6 ++++--
 .../test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py  | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f20b5fb6/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
index fb565a7..427ed63 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
+++ b/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,
         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",
+      )

http://git-wip-us.apache.org/repos/asf/ambari/blob/f20b5fb6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index 6454e13..cb4fd44 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -71,7 +71,8 @@ class TestHBaseMaster(RMFTestCase):
         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()
 
@@ -168,7 +169,8 @@ class TestHBaseMaster(RMFTestCase):
         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()
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f20b5fb6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
index 19b5485..11247e7 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py
@@ -71,7 +71,8 @@ class TestHbaseRegionServer(RMFTestCase):
         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()
     
@@ -118,7 +119,8 @@ class TestHbaseRegionServer(RMFTestCase):
         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()
 


Mime
View raw message