Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4425 Provide access to RpcServer in RegionServerServices 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1171865 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Helmling 2011-09-16 23:59:56 +00:00
parent 900a9124c4
commit d70a6ec716
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -501,6 +501,7 @@ Release 0.91.0 - Unreleased
a FAILED_OPEN state so that it can be retried quickly. (todd) a FAILED_OPEN state so that it can be retried quickly. (todd)
HBASE-4381 Refactor split decisions into a split policy class. (todd) HBASE-4381 Refactor split decisions into a split policy class. (todd)
HBASE-4373 HBaseAdmin.assign() does not use force flag (Ramkrishna) HBASE-4373 HBaseAdmin.assign() does not use force flag (Ramkrishna)
HBASE-4425 Provide access to RpcServer instance from RegionServerServices
TASKS TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel HBASE-3559 Move report of split to master OFF the heartbeat channel

5
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -1472,6 +1472,11 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
return rpcServer.getRpcMetrics(); return rpcServer.getRpcMetrics();
} }
@Override
public RpcServer getRpcServer() {
return rpcServer;
}
/** /**
* Cause the server to exit without closing the regions it is serving, the log * Cause the server to exit without closing the regions it is serving, the log
* it is using and without notifying the master. Used unit testing and on * it is using and without notifying the master. Used unit testing and on

6
src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
View File

@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.regionserver;
import java.io.IOException; import java.io.IOException;
import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.catalog.CatalogTracker;
import org.apache.hadoop.hbase.ipc.HBaseRpcMetrics; import org.apache.hadoop.hbase.ipc.RpcServer;
import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException;
import java.util.Set; import java.util.Set;
@ -68,9 +68,9 @@ public interface RegionServerServices extends OnlineRegions {
throws KeeperException, IOException; throws KeeperException, IOException;
/** /**
* Returns a reference to the RPC server metrics. * Returns a reference to the region server's RPC server
*/ */
public HBaseRpcMetrics getRpcMetrics(); public RpcServer getRpcServer();
/** /**
* Get the regions that are currently being opened or closed in the RS * Get the regions that are currently being opened or closed in the RS

4
src/test/java/org/apache/hadoop/hbase/regionserver/handler/MockRegionServerServices.java
View File

@ -26,7 +26,7 @@ import java.util.Set;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.catalog.CatalogTracker;
import org.apache.hadoop.hbase.ipc.HBaseRpcMetrics; import org.apache.hadoop.hbase.ipc.RpcServer;
import org.apache.hadoop.hbase.regionserver.CompactionRequestor; import org.apache.hadoop.hbase.regionserver.CompactionRequestor;
import org.apache.hadoop.hbase.regionserver.FlushRequester; import org.apache.hadoop.hbase.regionserver.FlushRequester;
import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegion;
@ -75,7 +75,7 @@ class MockRegionServerServices implements RegionServerServices {
} }
@Override @Override
public HBaseRpcMetrics getRpcMetrics() { public RpcServer getRpcServer() {
return null; return null;
} }