hbase git commit: HBASE-19127: Set State.SPLITTING, MERGING, MERGING_NEW, SPLITTING_NEW properly in RegionStatesNode
Repository: hbase Updated Branches: refs/heads/master 252ab3082 -> 0ec96a5ff HBASE-19127: Set State.SPLITTING, MERGING, MERGING_NEW, SPLITTING_NEW properly in RegionStatesNode Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0ec96a5f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0ec96a5f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0ec96a5f Branch: refs/heads/master Commit: 0ec96a5ffebfb842e2434b6d487e8da8f0d8843e Parents: 252ab30 Author: Yi Liang Authored: Wed Nov 8 09:38:46 2017 -0800 Committer: Michael Stack Committed: Thu Nov 9 11:34:29 2017 -0800 -- .../src/main/protobuf/MasterProcedure.proto | 18 +++ .../master/assignment/AssignmentManager.java| 5 ++ .../assignment/MergeTableRegionsProcedure.java | 29 ++- .../hbase/master/assignment/RegionStates.java | 2 +- .../assignment/SplitTableRegionProcedure.java | 52 +++- 5 files changed, 60 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/0ec96a5f/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto index 635beaf..f9b8807 100644 --- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto +++ b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto @@ -256,16 +256,14 @@ message SplitTableRegionStateData { enum MergeTableRegionsState { MERGE_TABLE_REGIONS_PREPARE = 1; MERGE_TABLE_REGIONS_PRE_OPERATION = 2; - MERGE_TABLE_REGIONS_MOVE_REGION_TO_SAME_RS = 3; - MERGE_TABLE_REGIONS_PRE_MERGE_OPERATION = 4; - MERGE_TABLE_REGIONS_SET_MERGING_TABLE_STATE = 5; - MERGE_TABLE_REGIONS_CLOSE_REGIONS = 6; - MERGE_TABLE_REGIONS_CREATE_MERGED_REGION = 7; - MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION = 8; - MERGE_TABLE_REGIONS_UPDATE_META = 9; - MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION = 10; - MERGE_TABLE_REGIONS_OPEN_MERGED_REGION = 11; - MERGE_TABLE_REGIONS_POST_OPERATION = 12; + MERGE_TABLE_REGIONS_PRE_MERGE_OPERATION = 3; + MERGE_TABLE_REGIONS_CLOSE_REGIONS = 4; + MERGE_TABLE_REGIONS_CREATE_MERGED_REGION = 5; + MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION = 6; + MERGE_TABLE_REGIONS_UPDATE_META = 7; + MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION = 8; + MERGE_TABLE_REGIONS_OPEN_MERGED_REGION = 9; + MERGE_TABLE_REGIONS_POST_OPERATION = 10; } message MergeTableRegionsStateData { http://git-wip-us.apache.org/repos/asf/hbase/blob/0ec96a5f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java index f4a3ca8..1c193f9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java @@ -1532,6 +1532,11 @@ public class AssignmentManager implements ServerListener { // regionStates#getRegionsOfTable final RegionStateNode node = regionStates.getOrCreateRegionNode(parent); node.setState(State.SPLIT); +final RegionStateNode nodeA = regionStates.getOrCreateRegionNode(daughterA); +nodeA.setState(State.SPLITTING_NEW); +final RegionStateNode nodeB = regionStates.getOrCreateRegionNode(daughterB); +nodeB.setState(State.SPLITTING_NEW); + regionStateStore.splitRegion(parent, daughterA, daughterB, serverName); if (shouldAssignFavoredNodes(parent)) { List onlineServers = this.master.getServerManager().getOnlineServersList(); http://git-wip-us.apache.org/repos/asf/hbase/blob/0ec96a5f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java index 642bb0d..6663d7c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java @@ -47,6 +47,7 @@ import org.apache.hadoop.hbase.master.CatalogJanitor; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.hbase.master.Maste
hbase git commit: HBASE-19127: Set State.SPLITTING, MERGING, MERGING_NEW, SPLITTING_NEW properly in RegionStatesNode
Repository: hbase Updated Branches: refs/heads/branch-2 afdafb4ba -> 07b0ac416 HBASE-19127: Set State.SPLITTING, MERGING, MERGING_NEW, SPLITTING_NEW properly in RegionStatesNode Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/07b0ac41 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/07b0ac41 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/07b0ac41 Branch: refs/heads/branch-2 Commit: 07b0ac41612128676ec0c932fbdacf463c9e20dd Parents: afdafb4 Author: Yi Liang Authored: Wed Nov 8 09:38:46 2017 -0800 Committer: Michael Stack Committed: Thu Nov 9 11:34:53 2017 -0800 -- .../src/main/protobuf/MasterProcedure.proto | 18 +++ .../master/assignment/AssignmentManager.java| 5 ++ .../assignment/MergeTableRegionsProcedure.java | 29 ++- .../hbase/master/assignment/RegionStates.java | 2 +- .../assignment/SplitTableRegionProcedure.java | 52 +++- 5 files changed, 60 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/07b0ac41/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto -- diff --git a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto index 635beaf..f9b8807 100644 --- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto +++ b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto @@ -256,16 +256,14 @@ message SplitTableRegionStateData { enum MergeTableRegionsState { MERGE_TABLE_REGIONS_PREPARE = 1; MERGE_TABLE_REGIONS_PRE_OPERATION = 2; - MERGE_TABLE_REGIONS_MOVE_REGION_TO_SAME_RS = 3; - MERGE_TABLE_REGIONS_PRE_MERGE_OPERATION = 4; - MERGE_TABLE_REGIONS_SET_MERGING_TABLE_STATE = 5; - MERGE_TABLE_REGIONS_CLOSE_REGIONS = 6; - MERGE_TABLE_REGIONS_CREATE_MERGED_REGION = 7; - MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION = 8; - MERGE_TABLE_REGIONS_UPDATE_META = 9; - MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION = 10; - MERGE_TABLE_REGIONS_OPEN_MERGED_REGION = 11; - MERGE_TABLE_REGIONS_POST_OPERATION = 12; + MERGE_TABLE_REGIONS_PRE_MERGE_OPERATION = 3; + MERGE_TABLE_REGIONS_CLOSE_REGIONS = 4; + MERGE_TABLE_REGIONS_CREATE_MERGED_REGION = 5; + MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION = 6; + MERGE_TABLE_REGIONS_UPDATE_META = 7; + MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION = 8; + MERGE_TABLE_REGIONS_OPEN_MERGED_REGION = 9; + MERGE_TABLE_REGIONS_POST_OPERATION = 10; } message MergeTableRegionsStateData { http://git-wip-us.apache.org/repos/asf/hbase/blob/07b0ac41/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java index f4a3ca8..1c193f9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java @@ -1532,6 +1532,11 @@ public class AssignmentManager implements ServerListener { // regionStates#getRegionsOfTable final RegionStateNode node = regionStates.getOrCreateRegionNode(parent); node.setState(State.SPLIT); +final RegionStateNode nodeA = regionStates.getOrCreateRegionNode(daughterA); +nodeA.setState(State.SPLITTING_NEW); +final RegionStateNode nodeB = regionStates.getOrCreateRegionNode(daughterB); +nodeB.setState(State.SPLITTING_NEW); + regionStateStore.splitRegion(parent, daughterA, daughterB, serverName); if (shouldAssignFavoredNodes(parent)) { List onlineServers = this.master.getServerManager().getOnlineServersList(); http://git-wip-us.apache.org/repos/asf/hbase/blob/07b0ac41/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java index 642bb0d..6663d7c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java @@ -47,6 +47,7 @@ import org.apache.hadoop.hbase.master.CatalogJanitor; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.hbase.master.M