Author: stack
Date: Fri Oct 1 23:15:38 2010
New Revision: 1003702
URL: http://svn.apache.org/viewvc?rev=1003702&view=rev
Log:
HBASE-3070 Add to hbaseadmin means of shutting down a regionserver
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1003702&r1=1003701&r2=1003702&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Oct 1 23:15:38 2010
@@ -965,6 +965,7 @@ Release 0.21.0 - Unreleased
HBASE-3066 We don't put the port for hregionserver up into znode since
new master
HBASE-2825 Scans respect row locks
+ HBASE-3070 Add to hbaseadmin means of shutting down a regionserver
NEW FEATURES
HBASE-1961 HBase EC2 scripts
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1003702&r1=1003701&r2=1003702&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
Fri Oct 1 23:15:38 2010
@@ -1007,6 +1007,16 @@ public class HBaseAdmin implements Abort
}
/**
+ * Stop the designated regionserver.
+ * @throws IOException if a remote or network exception occurs
+ */
+ public synchronized void stopRegionServer(final HServerAddress hsa)
+ throws IOException {
+ HRegionInterface rs = this.connection.getHRegionConnection(hsa);
+ rs.stop("Called by admin client " + this.connection.toString());
+ }
+
+ /**
* @return cluster status
* @throws IOException if a remote or network exception occurs
*/
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1003702&r1=1003701&r2=1003702&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Fri Oct 1 23:15:38 2010
@@ -64,7 +64,6 @@ import org.apache.hadoop.hbase.util.Soft
import org.apache.hadoop.hbase.util.Writables;
import org.apache.hadoop.hbase.zookeeper.RootRegionTracker;
import org.apache.hadoop.hbase.zookeeper.ZKTableDisable;
-import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.zookeeper.KeeperException;
@@ -271,6 +270,12 @@ public class HConnectionManager {
this.masterChecked = false;
}
+ @Override
+ public String toString() {
+ // Return our zk identifier ... it 'hconnection + zk sessionid'.
+ return this.zooKeeper.toString();
+ }
+
private long getPauseTime(int tries) {
int ntries = tries;
if (ntries >= HConstants.RETRY_BACKOFF.length) {
