svn commit: r1171865 - in /hbase/trunk: ./ src/main/java/org/apache/hadoop/hbase/regionserver/ src/test/java/org/apache/hadoop/hbase/regionserver/handler/

[garyh]

Author: garyh
Date: Fri Sep 16 23:59:56 2011
New Revision: 1171865

URL: http://svn.apache.org/viewvc?rev=1171865&view=rev
Log:
HBASE-4425  Provide access to RpcServer in RegionServerServices

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
    
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/MockRegionServerServices.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1171865&r1=1171864&r2=1171865&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Sep 16 23:59:56 2011
@@ -501,6 +501,7 @@ Release 0.91.0 - Unreleased
                a FAILED_OPEN state so that it can be retried quickly. (todd)
    HBASE-4381  Refactor split decisions into a split policy class. (todd)
    HBASE-4373  HBaseAdmin.assign() does not use force flag (Ramkrishna)
+   HBASE-4425  Provide access to RpcServer instance from RegionServerServices
 
   TASKS
    HBASE-3559  Move report of split to master OFF the heartbeat channel

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1171865&r1=1171864&r2=1171865&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Fri Sep 16 23:59:56 2011
@@ -1472,6 +1472,11 @@ public class HRegionServer implements HR
     return rpcServer.getRpcMetrics();
   }
 
+  @Override
+  public RpcServer getRpcServer() {
+    return rpcServer;
+  }
+
   /**
    * 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

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java?rev=1171865&r1=1171864&r2=1171865&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
 Fri Sep 16 23:59:56 2011
@@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.regionse
 import java.io.IOException;
 
 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.zookeeper.KeeperException;
 import java.util.Set;
@@ -68,9 +68,9 @@ public interface RegionServerServices ex
   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

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/MockRegionServerServices.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/MockRegionServerServices.java?rev=1171865&r1=1171864&r2=1171865&view=diff
==============================================================================
--- 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/MockRegionServerServices.java
 (original)
+++ 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/MockRegionServerServices.java
 Fri Sep 16 23:59:56 2011
@@ -26,7 +26,7 @@ import java.util.Set;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ServerName;
 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.FlushRequester;
 import org.apache.hadoop.hbase.regionserver.HRegion;
@@ -75,7 +75,7 @@ class MockRegionServerServices implement
   }
 
   @Override
-  public HBaseRpcMetrics getRpcMetrics() {
+  public RpcServer getRpcServer() {
     return null;
   }