Index: src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java
===================================================================
--- src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java (revision 939014)
+++ src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java (working copy)
@@ -26,19 +26,16 @@
import java.util.Set;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HServerInfo;
import org.apache.hadoop.hbase.RemoteExceptionHandler;
-import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.ipc.HRegionInterface;
import org.apache.hadoop.hbase.regionserver.HLog;
import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.util.Writables;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.io.RowResult;
/**
* Instantiated when a server's lease has expired, meaning it has crashed.
@@ -143,10 +140,9 @@
// shutdown server but that would mean that we'd reassign regions that
// were already out being assigned, ones that were product of a split
// that happened while the shutdown was being processed.
- String serverAddress =
- Bytes.toString(values.getValue(CATALOG_FAMILY, SERVER_QUALIFIER));
- long startCode =
- Bytes.toLong(values.getValue(CATALOG_FAMILY, STARTCODE_QUALIFIER));
+ String serverAddress = BaseScanner.getServerAddress(values);
+ long startCode = BaseScanner.getStartCode(values);
+
String serverName = null;
if (serverAddress != null && serverAddress.length() > 0) {
serverName = HServerInfo.getServerName(serverAddress, startCode);
Index: src/java/org/apache/hadoop/hbase/master/BaseScanner.java
===================================================================
--- src/java/org/apache/hadoop/hbase/master/BaseScanner.java (revision 939014)
+++ src/java/org/apache/hadoop/hbase/master/BaseScanner.java (working copy)
@@ -247,7 +247,7 @@
* @param r
* @return Empty String or server address found in r
*/
- private String getServerAddress(final Result r) {
+ static String getServerAddress(final Result r) {
byte [] val = r.getValue(CATALOG_FAMILY, SERVER_QUALIFIER);
return val == null || val.length <= 0? "": Bytes.toString(val);
}
@@ -256,7 +256,7 @@
* @param r
* @return Return 0L or server startcode found in r
*/
- private long getStartCode(final Result r) {
+ static long getStartCode(final Result r) {
byte [] val = r.getValue(CATALOG_FAMILY, STARTCODE_QUALIFIER);
return val == null || val.length <= 0? 0L: Bytes.toLong(val);
}