[1/3] hbase git commit: HBASE-18107: [AMv2] Remove DispatchMergingRegionsRequest & DispatchMergingRegions
Repository: hbase
Updated Branches:
refs/heads/branch-2 ab90823c4 -> 9e230dc32
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e230dc3/hbase-protocol-shaded/src/main/protobuf/Admin.proto
--
diff --git a/hbase-protocol-shaded/src/main/protobuf/Admin.proto
b/hbase-protocol-shaded/src/main/protobuf/Admin.proto
index 6d67c89..3b8891b 100644
--- a/hbase-protocol-shaded/src/main/protobuf/Admin.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/Admin.proto
@@ -273,22 +273,6 @@ message ExecuteProceduresResponse {
repeated CloseRegionResponse close_region = 2;
}
-/**
- * Merges the specified regions.
- *
- * This method currently closes the regions and then merges them
- */
-message MergeRegionsRequest {
- required RegionSpecifier region_a = 1;
- required RegionSpecifier region_b = 2;
- optional bool forcible = 3 [default = false];
- // wall clock time from master
- optional uint64 master_system_time = 4;
-}
-
-message MergeRegionsResponse {
-}
-
service AdminService {
rpc GetRegionInfo(GetRegionInfoRequest)
returns(GetRegionInfoResponse);
@@ -350,7 +334,4 @@ service AdminService {
rpc ExecuteProcedures(ExecuteProceduresRequest)
returns(ExecuteProceduresResponse);
-
- rpc MergeRegions(MergeRegionsRequest)
-returns(MergeRegionsResponse);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e230dc3/hbase-protocol-shaded/src/main/protobuf/Master.proto
--
diff --git a/hbase-protocol-shaded/src/main/protobuf/Master.proto
b/hbase-protocol-shaded/src/main/protobuf/Master.proto
index c9c586f..8d7cad9 100644
--- a/hbase-protocol-shaded/src/main/protobuf/Master.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/Master.proto
@@ -81,20 +81,6 @@ message MoveRegionRequest {
message MoveRegionResponse {
}
- /**
- * Dispatch merging the specified regions.
- */
-message DispatchMergingRegionsRequest {
- required RegionSpecifier region_a = 1;
- required RegionSpecifier region_b = 2;
- optional bool forcible = 3 [default = false];
- optional uint64 nonce_group = 4 [default = 0];
- optional uint64 nonce = 5 [default = 0];
-}
-
-message DispatchMergingRegionsResponse {
- optional uint64 proc_id = 1;
-}
/**
* Merging the specified regions in a table.
@@ -667,10 +653,6 @@ service MasterService {
rpc ModifyColumn(ModifyColumnRequest)
returns(ModifyColumnResponse);
- /** Master dispatch merging the regions */
- rpc DispatchMergingRegions(DispatchMergingRegionsRequest)
-returns(DispatchMergingRegionsResponse);
-
/** Move the region region to the destination server. */
rpc MoveRegion(MoveRegionRequest)
returns(MoveRegionResponse);
http://git-wip-us.apache.org/repos/asf/hbase/blob/9e230dc3/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index e5f440e..573c353 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -115,7 +115,6 @@ import
org.apache.hadoop.hbase.master.procedure.CreateTableProcedure;
import org.apache.hadoop.hbase.master.procedure.DeleteColumnFamilyProcedure;
import org.apache.hadoop.hbase.master.procedure.DeleteTableProcedure;
import org.apache.hadoop.hbase.master.procedure.DisableTableProcedure;
-import
org.apache.hadoop.hbase.master.procedure.DispatchMergingRegionsProcedure;
import org.apache.hadoop.hbase.master.procedure.EnableTableProcedure;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureConstants;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
@@ -1522,59 +1521,6 @@ public class HMaster extends HRegionServer implements
MasterServices {
}
@Override
- public long dispatchMergingRegions(
- final HRegionInfo regionInfoA,
- final HRegionInfo regionInfoB,
- final boolean forcible,
- final long nonceGroup,
- final long nonce) throws IOException {
-checkInitialized();
-
-TableName tableName = regionInfoA.getTable();
-if (tableName == null || regionInfoB.getTable() == null) {
- throw new UnknownRegionException ("Can't merge regions without table
associated");
-}
-
-if (!tableName.equals(regionInfoB.getTable())) {
- throw new IOException ("Cannot merge regions from two different tables");
-}
-
-if (regionInfoA.compareTo(regionInfoB) == 0) {
- throw new MergeRegionException(
-"Cannot merge a region to itself " + regionInfoA + ", " + regionInfoB);
-}
-
-final HRegionInfo [] regionsToMerge = new HRegionInfo[2];
-regionsToMerge [0] = regionInfoA;
-regionsToMerge [1] = regionInfoB;
-
-return MasterProcedureUti
[1/3] hbase git commit: HBASE-18107: [AMv2] Remove DispatchMergingRegionsRequest & DispatchMergingRegions
Repository: hbase
Updated Branches:
refs/heads/master f391770f4 -> e9d8a7b6d
http://git-wip-us.apache.org/repos/asf/hbase/blob/e9d8a7b6/hbase-protocol-shaded/src/main/protobuf/Admin.proto
--
diff --git a/hbase-protocol-shaded/src/main/protobuf/Admin.proto
b/hbase-protocol-shaded/src/main/protobuf/Admin.proto
index 6d67c89..3b8891b 100644
--- a/hbase-protocol-shaded/src/main/protobuf/Admin.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/Admin.proto
@@ -273,22 +273,6 @@ message ExecuteProceduresResponse {
repeated CloseRegionResponse close_region = 2;
}
-/**
- * Merges the specified regions.
- *
- * This method currently closes the regions and then merges them
- */
-message MergeRegionsRequest {
- required RegionSpecifier region_a = 1;
- required RegionSpecifier region_b = 2;
- optional bool forcible = 3 [default = false];
- // wall clock time from master
- optional uint64 master_system_time = 4;
-}
-
-message MergeRegionsResponse {
-}
-
service AdminService {
rpc GetRegionInfo(GetRegionInfoRequest)
returns(GetRegionInfoResponse);
@@ -350,7 +334,4 @@ service AdminService {
rpc ExecuteProcedures(ExecuteProceduresRequest)
returns(ExecuteProceduresResponse);
-
- rpc MergeRegions(MergeRegionsRequest)
-returns(MergeRegionsResponse);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e9d8a7b6/hbase-protocol-shaded/src/main/protobuf/Master.proto
--
diff --git a/hbase-protocol-shaded/src/main/protobuf/Master.proto
b/hbase-protocol-shaded/src/main/protobuf/Master.proto
index c9c586f..8d7cad9 100644
--- a/hbase-protocol-shaded/src/main/protobuf/Master.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/Master.proto
@@ -81,20 +81,6 @@ message MoveRegionRequest {
message MoveRegionResponse {
}
- /**
- * Dispatch merging the specified regions.
- */
-message DispatchMergingRegionsRequest {
- required RegionSpecifier region_a = 1;
- required RegionSpecifier region_b = 2;
- optional bool forcible = 3 [default = false];
- optional uint64 nonce_group = 4 [default = 0];
- optional uint64 nonce = 5 [default = 0];
-}
-
-message DispatchMergingRegionsResponse {
- optional uint64 proc_id = 1;
-}
/**
* Merging the specified regions in a table.
@@ -667,10 +653,6 @@ service MasterService {
rpc ModifyColumn(ModifyColumnRequest)
returns(ModifyColumnResponse);
- /** Master dispatch merging the regions */
- rpc DispatchMergingRegions(DispatchMergingRegionsRequest)
-returns(DispatchMergingRegionsResponse);
-
/** Move the region region to the destination server. */
rpc MoveRegion(MoveRegionRequest)
returns(MoveRegionResponse);
http://git-wip-us.apache.org/repos/asf/hbase/blob/e9d8a7b6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 46be60f..77869f5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -115,7 +115,6 @@ import
org.apache.hadoop.hbase.master.procedure.CreateTableProcedure;
import org.apache.hadoop.hbase.master.procedure.DeleteColumnFamilyProcedure;
import org.apache.hadoop.hbase.master.procedure.DeleteTableProcedure;
import org.apache.hadoop.hbase.master.procedure.DisableTableProcedure;
-import
org.apache.hadoop.hbase.master.procedure.DispatchMergingRegionsProcedure;
import org.apache.hadoop.hbase.master.procedure.EnableTableProcedure;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureConstants;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
@@ -1531,59 +1530,6 @@ public class HMaster extends HRegionServer implements
MasterServices {
}
@Override
- public long dispatchMergingRegions(
- final HRegionInfo regionInfoA,
- final HRegionInfo regionInfoB,
- final boolean forcible,
- final long nonceGroup,
- final long nonce) throws IOException {
-checkInitialized();
-
-TableName tableName = regionInfoA.getTable();
-if (tableName == null || regionInfoB.getTable() == null) {
- throw new UnknownRegionException ("Can't merge regions without table
associated");
-}
-
-if (!tableName.equals(regionInfoB.getTable())) {
- throw new IOException ("Cannot merge regions from two different tables");
-}
-
-if (regionInfoA.compareTo(regionInfoB) == 0) {
- throw new MergeRegionException(
-"Cannot merge a region to itself " + regionInfoA + ", " + regionInfoB);
-}
-
-final HRegionInfo [] regionsToMerge = new HRegionInfo[2];
-regionsToMerge [0] = regionInfoA;
-regionsToMerge [1] = regionInfoB;
-
-return MasterProcedureUtil.
