svn commit: r1345390 [3/3] - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/ 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/hba...

[st...@apache.org]

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java?rev=1345390&r1=1345389&r2=1345390&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java Fri Jun  1 23:18:20 2012
@@ -1198,7 +1198,7 @@ public class HBaseFsck {
     // first time we assume the rs's supports #offline.
     try {
       LOG.info("Offlining region " + regionString);
-      admin.getMaster().offline(regionName);
+      admin.offline(regionName);
     } catch (IOException ioe) {
       String notFoundMsg = "java.lang.NoSuchMethodException: " +
         "org.apache.hadoop.hbase.master.HMaster.offline([B)";

Modified: hbase/trunk/hbase-server/src/main/protobuf/Master.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/protobuf/Master.proto?rev=1345390&r1=1345389&r2=1345390&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/protobuf/Master.proto (original)
+++ hbase/trunk/hbase-server/src/main/protobuf/Master.proto Fri Jun  1 23:18:20 2012
@@ -26,6 +26,32 @@ option optimize_for = SPEED;
 
 import "hbase.proto";
 
+/* Column-level protobufs */
+
+message AddColumnRequest {
+  required bytes tableName = 1;
+  required ColumnFamilySchema columnFamilies = 2;
+}
+
+message AddColumnResponse {
+}
+
+message DeleteColumnRequest {
+  required bytes tableName = 1;
+  required bytes columnName = 2;
+}
+
+message DeleteColumnResponse {
+}
+
+message ModifyColumnRequest {
+  required bytes tableName = 1;
+  required ColumnFamilySchema columnFamilies = 2;
+}
+
+message ModifyColumnResponse {
+}
+
 /* Region-level Protos */
 
 message MoveRegionRequest {
@@ -51,6 +77,52 @@ message UnassignRegionRequest {
 message UnassignRegionResponse {
 }
 
+message OfflineRegionRequest {
+  required RegionSpecifier region = 1;
+}
+
+message OfflineRegionResponse {
+}
+
+/* Table-level protobufs */
+
+message CreateTableRequest {
+  required TableSchema tableSchema = 1;
+  repeated bytes splitKeys = 2;
+}
+
+message CreateTableResponse {
+}
+
+message DeleteTableRequest {
+  required bytes tableName = 1;
+}
+
+message DeleteTableResponse {
+}
+
+message EnableTableRequest {
+  required bytes tableName = 1;
+}
+
+message EnableTableResponse {
+}
+
+message DisableTableRequest {
+  required bytes tableName = 1;
+}
+
+message DisableTableResponse {
+}
+
+message ModifyTableRequest {
+  required bytes tableName = 1;
+  required TableSchema tableSchema = 2;
+}
+
+message ModifyTableResponse {
+}
+
 /* Cluster-level protobufs */
 
 message IsMasterRunningRequest {
@@ -88,7 +160,36 @@ message SetBalancerRunningResponse {
   optional bool prevBalanceValue = 1;
 }
 
+message GetSchemaAlterStatusRequest {
+  required bytes tableName = 1;
+}
+
+message GetSchemaAlterStatusResponse {
+  optional uint32 yetToUpdateRegions = 1;
+  optional uint32 totalRegions = 2;
+}
+
+message GetTableDescriptorsRequest {
+  repeated string tableNames = 1;
+}
+
+message GetTableDescriptorsResponse {
+  repeated TableSchema tableSchema = 1;
+}
+
 service MasterService {
+   /** Adds a column to the specified table. */
+  rpc addColumn(AddColumnRequest)
+    returns(AddColumnResponse);
+
+  /** Deletes a column from the specified table. Table must be disabled. */
+  rpc deleteColumn(DeleteColumnRequest)
+    returns(DeleteColumnResponse);
+
+  /** Modifies an existing column on the specified table. */
+  rpc modifyColumn(ModifyColumnRequest)
+    returns(ModifyColumnResponse);
+
   /** Move the region region to the destination server. */
   rpc moveRegion(MoveRegionRequest)
     returns(MoveRegionResponse);
@@ -106,6 +207,35 @@ service MasterService {
   rpc unassignRegion(UnassignRegionRequest)
     returns(UnassignRegionResponse);
 
+  /**
+   * Offline a region from the assignment manager's in-memory state.  The
+   * region should be in a closed state and there will be no attempt to
+   * automatically reassign the region as in unassign.   This is a special
+   * method, and should only be used by experts or hbck.
+   */
+  rpc offlineRegion(OfflineRegionRequest)
+    returns(OfflineRegionResponse);
+
+  /** Deletes a table */
+  rpc deleteTable(DeleteTableRequest)
+    returns(DeleteTableResponse);
+
+  /** Puts the table on-line (only needed if table has been previously taken offline) */
+  rpc enableTable(EnableTableRequest)
+    returns(EnableTableResponse);
+
+  /** Take table offline */
+  rpc disableTable(DisableTableRequest)
+    returns(DisableTableResponse);
+
+  /** Modify a table's metadata */
+  rpc modifyTable(ModifyTableRequest)
+    returns(ModifyTableResponse);
+
+  /** Creates a new table asynchronously */
+  rpc createTable(CreateTableRequest)
+    returns(CreateTableResponse);
+
   /** return true if master is available */
   rpc isMasterRunning(IsMasterRunningRequest)
     returns(IsMasterRunningResponse);
@@ -132,4 +262,12 @@ service MasterService {
    */
   rpc setBalancerRunning(SetBalancerRunningRequest)
     returns(SetBalancerRunningResponse);
-}
\ No newline at end of file
+
+  /** Used by the client to get the number of regions that have received the updated schema */
+  rpc getSchemaAlterStatus(GetSchemaAlterStatusRequest)
+    returns(GetSchemaAlterStatusResponse);
+
+  /** Get list of TableDescriptors for requested tables. */
+  rpc getTableDescriptors(GetTableDescriptorsRequest)
+    returns(GetTableDescriptorsResponse);
+}

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java?rev=1345390&r1=1345389&r2=1345390&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java Fri Jun  1 23:18:20 2012
@@ -196,7 +196,7 @@ public class TestHBaseFsck {
       HRegionInfo hri) throws IOException, InterruptedException {
     try {
       HBaseFsckRepair.closeRegionSilentlyAndWait(admin, sn, hri);
-      admin.getMaster().offline(hri.getRegionName());
+      admin.offline(hri.getRegionName());
     } catch (IOException ioe) {
       LOG.warn("Got exception when attempting to offline region "
           + Bytes.toString(hri.getRegionName()), ioe);