You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/02/10 09:11:05 UTC

hbase git commit: HBASE-15190 Monkey dies when running on shared cluster (gives up when can't kill the other fellows processes)

Repository: hbase
Updated Branches:
  refs/heads/0.98 de149d0bc -> 5d1c3c901


HBASE-15190 Monkey dies when running on shared cluster (gives up when can't kill the other fellows processes)


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

Branch: refs/heads/0.98
Commit: 5d1c3c901d35c6e3f41f4b68960c4713fe0c4eab
Parents: de149d0
Author: stack <st...@apache.org>
Authored: Sun Jan 31 10:51:41 2016 -0600
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Feb 10 00:10:50 2016 -0800

----------------------------------------------------------------------
 .../test/java/org/apache/hadoop/hbase/HBaseClusterManager.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5d1c3c90/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java
index c49ae44..ba6a4a9 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/HBaseClusterManager.java
@@ -174,7 +174,7 @@ public class HBaseClusterManager extends Configured implements ClusterManager {
     }
 
     protected String findPidCommand(ServiceType service) {
-      return String.format("ps aux | grep proc_%s | grep -v grep | tr -s ' ' | cut -d ' ' -f2",
+      return String.format("ps ux | grep proc_%s | grep -v grep | tr -s ' ' | cut -d ' ' -f2",
           service);
     }
 
@@ -269,7 +269,7 @@ public class HBaseClusterManager extends Configured implements ClusterManager {
 
     @Override
     protected String findPidCommand(ServiceType service) {
-      return String.format("ps aux | grep %s | grep -v grep | tr -s ' ' | cut -d ' ' -f2",
+      return String.format("ps ux | grep %s | grep -v grep | tr -s ' ' | cut -d ' ' -f2",
         service);
     }
   }