hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject hbase git commit: HBASE-13958 RESTApiClusterManager calls kill() instead of suspend() and resume()
Date Fri, 26 Jun 2015 21:37:18 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 095e1f865 -> 67cdfcc33


HBASE-13958 RESTApiClusterManager calls kill() instead of suspend() and resume()

Conflicts:
	hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java


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

Branch: refs/heads/0.98
Commit: 67cdfcc33108c51a8a8b085d07104e98b1a8911f
Parents: 095e1f8
Author: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Authored: Wed Jun 24 13:36:15 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Fri Jun 26 14:36:58 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/RESTApiClusterManager.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/67cdfcc3/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java
index 28fac4e..2fbf7a2 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java
@@ -158,15 +158,14 @@ public class RESTApiClusterManager extends Configured implements ClusterManager
 
   @Override
   public void suspend(ServiceType service, String hostname, int port) throws IOException
{
-    hBaseClusterManager.kill(service, hostname, port);
+    hBaseClusterManager.suspend(service, hostname, port);
   }
 
   @Override
   public void resume(ServiceType service, String hostname, int port) throws IOException {
-    hBaseClusterManager.kill(service, hostname, port);
+    hBaseClusterManager.resume(service, hostname, port);
   }
 
-
   // Convenience method to execute command against role on hostname. Only graceful commands
are
   // supported since cluster management APIs don't tend to let you SIGKILL things.
   private void performClusterManagerCommand(ServiceType role, String hostname, RoleCommand
command)


Mime
View raw message