svn commit: r1339488 [3/3] - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/client/ main/java/org/apache/hadoop/hbase/ipc/ main/java/org/apache/hadoop/hbase/master/ main/java/org/apache/hadoop/hbase/protobuf/ main/java/org/apache/hadoop/hbase/p...

[st...@apache.org]

Modified: hbase/trunk/src/main/protobuf/RegionServerStatus.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/protobuf/RegionServerStatus.proto?rev=1339488&r1=1339487&r2=1339488&view=diff
==============================================================================
--- hbase/trunk/src/main/protobuf/RegionServerStatus.proto (original)
+++ hbase/trunk/src/main/protobuf/RegionServerStatus.proto Thu May 17 05:06:15 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-// This file contains protocol buffers that are used for MasterRegionProtocol.
+// This file contains protocol buffers that are used for RegionServerStatusProtocol.
 
 option java_package = "org.apache.hadoop.hbase.protobuf.generated";
 option java_outer_classname = "RegionServerStatusProtos";

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java?rev=1339488&r1=1339487&r2=1339488&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java Thu May 17 05:06:15 2012
@@ -31,6 +31,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.master.AssignmentManager;
 import org.apache.hadoop.hbase.master.HMaster;
+import org.apache.hadoop.hbase.protobuf.RequestConverter;
 import org.apache.hadoop.hbase.master.ServerManager;
 import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.regionserver.HRegion;
@@ -47,6 +48,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import com.google.protobuf.ServiceException;
+
 /**
  * Test the draining servers feature.
  * @see <a href="https://issues.apache.org/jira/browse/HBASE-4298">HBASE-4298</a>
@@ -138,7 +141,7 @@ public class TestDrainingServer {
    */
   @Test  // (timeout=30000)
   public void testDrainingServerOffloading()
-  throws IOException, KeeperException {
+  throws IOException, KeeperException, ServiceException, DeserializationException {
     // I need master in the below.
     HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster();
     HRegionInfo hriToMoveBack = null;
@@ -153,7 +156,8 @@ public class TestDrainingServer {
       for (HRegionInfo hri : hris) {
         // Pass null and AssignmentManager will chose a random server BUT it
         // should exclude draining servers.
-        master.move(hri.getEncodedNameAsBytes(), null);
+        master.moveRegion(null,
+          RequestConverter.buildMoveRegionRequest(hri.getEncodedNameAsBytes(), null));
         // Save off region to move back.
         hriToMoveBack = hri;
       }
@@ -165,8 +169,9 @@ public class TestDrainingServer {
     }
     // Now we've unset the draining server, we should be able to move a region
     // to what was the draining server.
-    master.move(hriToMoveBack.getEncodedNameAsBytes(),
-      Bytes.toBytes(drainingServer.getServerName().toString()));
+    master.moveRegion(null,
+      RequestConverter.buildMoveRegionRequest(hriToMoveBack.getEncodedNameAsBytes(),
+      Bytes.toBytes(drainingServer.getServerName().toString())));
     // Wait for regions to come back on line again.
     waitForAllRegionsOnline();
     Assert.assertEquals(1, drainingServer.getNumberOfOnlineRegions());

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java?rev=1339488&r1=1339487&r2=1339488&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java Thu May 17 05:06:15 2012
@@ -41,6 +41,7 @@ import org.apache.hadoop.hbase.client.HT
 import org.apache.hadoop.hbase.master.AssignmentManager;
 import org.apache.hadoop.hbase.master.HMaster;
 import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
+import org.apache.hadoop.hbase.protobuf.RequestConverter;
 import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -945,8 +946,8 @@ public class TestMasterObserver {
     }
     assertTrue("Found server", found);
     LOG.info("Found " + destName);
-    master.move(firstGoodPair.getKey().getEncodedNameAsBytes(),
-      Bytes.toBytes(destName));
+    master.moveRegion(null,RequestConverter.buildMoveRegionRequest(
+      firstGoodPair.getKey().getEncodedNameAsBytes(),Bytes.toBytes(destName)));
     assertTrue("Coprocessor should have been called on region move",
       cp.wasMoveCalled());
 
@@ -965,7 +966,8 @@ public class TestMasterObserver {
     for (int i=0; i<moveCnt; i++) {
       HRegionInfo info = openRegions.get(i);
       if (!info.isMetaTable()) {
-        master.move(openRegions.get(i).getEncodedNameAsBytes(), destRS);
+        master.moveRegion(null,RequestConverter.buildMoveRegionRequest(
+          openRegions.get(i).getEncodedNameAsBytes(), destRS));
       }
     }