[41/60] [abbrv] hbase git commit: HBASE-18105 [AMv2] Split/Merge need cleanup; currently they diverge and do not fully embrace AMv2 world (Yi Liang)

2017-10-05 Thread busbey 
HBASE-18105 [AMv2] Split/Merge need cleanup; currently they diverge and do not 
fully embrace AMv2 world (Yi Liang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/38eaf47f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/38eaf47f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/38eaf47f

Branch: refs/heads/HBASE-18467
Commit: 38eaf47fa7dd4b0b3b822e73c9e644370a5cacb6
Parents: d35d837
Author: Michael Stack 
Authored: Mon Oct 2 11:38:11 2017 -0700
Committer: Michael Stack 
Committed: Mon Oct 2 11:38:11 2017 -0700

--
 .../src/main/protobuf/MasterProcedure.proto |  4 +--
 .../src/main/protobuf/RegionServerStatus.proto  |  6 ++--
 .../hbase/coprocessor/MasterObserver.java   | 12 +++
 .../hbase/master/MasterCoprocessorHost.java | 12 +++
 .../master/assignment/AssignmentManager.java|  2 --
 .../assignment/SplitTableRegionProcedure.java   | 29 -
 .../hbase/coprocessor/TestMasterObserver.java   |  4 +--
 .../TestMergeTableRegionsProcedure.java | 29 +
 .../TestSplitTableRegionProcedure.java  | 33 
 .../MasterProcedureTestingUtility.java  |  2 +-
 .../TestSplitTransactionOnCluster.java  |  2 +-
 11 files changed, 99 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/38eaf47f/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 2cdebb1..626530f 100644
--- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
@@ -286,9 +286,9 @@ enum SplitTableRegionState {
   SPLIT_TABLE_REGION_PRE_OPERATION = 2;
   SPLIT_TABLE_REGION_CLOSE_PARENT_REGION = 3;
   SPLIT_TABLE_REGION_CREATE_DAUGHTER_REGIONS = 4;
-  SPLIT_TABLE_REGION_PRE_OPERATION_BEFORE_PONR = 5;
+  SPLIT_TABLE_REGION_PRE_OPERATION_BEFORE_META = 5;
   SPLIT_TABLE_REGION_UPDATE_META = 6;
-  SPLIT_TABLE_REGION_PRE_OPERATION_AFTER_PONR = 7;
+  SPLIT_TABLE_REGION_PRE_OPERATION_AFTER_META = 7;
   SPLIT_TABLE_REGION_OPEN_CHILD_REGIONS = 8;
   SPLIT_TABLE_REGION_POST_OPERATION = 9;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/38eaf47f/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
--
diff --git a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto 
b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
index 1cd4376..f83bb20 100644
--- a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
@@ -105,11 +105,13 @@ message RegionStateTransition {
 READY_TO_SPLIT = 3;
 READY_TO_MERGE = 4;
 
-SPLIT_PONR = 5;
-MERGE_PONR = 6;
 
+/** We used to have PONR enums for split and merge in here occupying
+ positions 5 and 6 but they have since been removed. Do not reuse these
+ indices */
 SPLIT = 7;
 MERGED = 8;
+
 SPLIT_REVERTED = 9;
 MERGE_REVERTED = 10;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/38eaf47f/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
index bfa88e6..85da610 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
@@ -696,25 +696,25 @@ public interface MasterObserver {
   final RegionInfo regionInfoB) throws IOException {}
 
   /**
-   * This will be called before PONR step as part of split transaction. Calling
+   * This will be called before update META step as part of split transaction. 
Calling
* {@link org.apache.hadoop.hbase.coprocessor.ObserverContext#bypass()} 
rollback the split
* @param ctx the environment to interact with the framework and master
* @param splitKey
* @param metaEntries
*/
-  default void preSplitRegionBeforePONRAction(
+  default void preSplitRegionBeforeMETAAction(
   final ObserverContext ctx,
   final byte[] splitKey,
   final List metaEntries) throws IOException {}
 
 
   /**
-   * This will be called after PONR step as part of split transaction
+   * This will be called after update META step as part of split transaction
* Calling {@link

hbase git commit: HBASE-18105 [AMv2] Split/Merge need cleanup; currently they diverge and do not fully embrace AMv2 world (Yi Liang)

2017-10-02 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 e047f518e -> 24e40f3e8


HBASE-18105 [AMv2] Split/Merge need cleanup; currently they diverge and do not 
fully embrace AMv2 world (Yi Liang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/24e40f3e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/24e40f3e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/24e40f3e

Branch: refs/heads/branch-2
Commit: 24e40f3e85e12f0eb74b8377c6470d35407282e6
Parents: e047f51
Author: Michael Stack 
Authored: Mon Oct 2 11:38:11 2017 -0700
Committer: Michael Stack 
Committed: Mon Oct 2 11:38:57 2017 -0700

--
 .../src/main/protobuf/MasterProcedure.proto |  4 +--
 .../src/main/protobuf/RegionServerStatus.proto  |  6 ++--
 .../hbase/coprocessor/MasterObserver.java   | 12 +++
 .../hbase/master/MasterCoprocessorHost.java | 12 +++
 .../master/assignment/AssignmentManager.java|  2 --
 .../assignment/SplitTableRegionProcedure.java   | 29 -
 .../hbase/coprocessor/TestMasterObserver.java   |  4 +--
 .../TestMergeTableRegionsProcedure.java | 29 +
 .../TestSplitTableRegionProcedure.java  | 33 
 .../MasterProcedureTestingUtility.java  |  2 +-
 .../TestSplitTransactionOnCluster.java  |  2 +-
 11 files changed, 99 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/24e40f3e/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 2cdebb1..626530f 100644
--- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
@@ -286,9 +286,9 @@ enum SplitTableRegionState {
   SPLIT_TABLE_REGION_PRE_OPERATION = 2;
   SPLIT_TABLE_REGION_CLOSE_PARENT_REGION = 3;
   SPLIT_TABLE_REGION_CREATE_DAUGHTER_REGIONS = 4;
-  SPLIT_TABLE_REGION_PRE_OPERATION_BEFORE_PONR = 5;
+  SPLIT_TABLE_REGION_PRE_OPERATION_BEFORE_META = 5;
   SPLIT_TABLE_REGION_UPDATE_META = 6;
-  SPLIT_TABLE_REGION_PRE_OPERATION_AFTER_PONR = 7;
+  SPLIT_TABLE_REGION_PRE_OPERATION_AFTER_META = 7;
   SPLIT_TABLE_REGION_OPEN_CHILD_REGIONS = 8;
   SPLIT_TABLE_REGION_POST_OPERATION = 9;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/24e40f3e/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
--
diff --git a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto 
b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
index 1cd4376..f83bb20 100644
--- a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
@@ -105,11 +105,13 @@ message RegionStateTransition {
 READY_TO_SPLIT = 3;
 READY_TO_MERGE = 4;
 
-SPLIT_PONR = 5;
-MERGE_PONR = 6;
 
+/** We used to have PONR enums for split and merge in here occupying
+ positions 5 and 6 but they have since been removed. Do not reuse these
+ indices */
 SPLIT = 7;
 MERGED = 8;
+
 SPLIT_REVERTED = 9;
 MERGE_REVERTED = 10;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/24e40f3e/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
index bfa88e6..85da610 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
@@ -696,25 +696,25 @@ public interface MasterObserver {
   final RegionInfo regionInfoB) throws IOException {}
 
   /**
-   * This will be called before PONR step as part of split transaction. Calling
+   * This will be called before update META step as part of split transaction. 
Calling
* {@link org.apache.hadoop.hbase.coprocessor.ObserverContext#bypass()} 
rollback the split
* @param ctx the environment to interact with the framework and master
* @param splitKey
* @param metaEntries
*/
-  default void preSplitRegionBeforePONRAction(
+  default void preSplitRegionBeforeMETAAction(
   final ObserverContext ctx,
   final byte[] splitKey,
   final List metaEntries) throws IOException {}
 
 
   /**
-   * This will be called after PONR step as part of split transaction
+   * This will be

hbase git commit: HBASE-18105 [AMv2] Split/Merge need cleanup; currently they diverge and do not fully embrace AMv2 world (Yi Liang)

2017-10-02 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/master d35d8376a -> 38eaf47fa


HBASE-18105 [AMv2] Split/Merge need cleanup; currently they diverge and do not 
fully embrace AMv2 world (Yi Liang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/38eaf47f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/38eaf47f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/38eaf47f

Branch: refs/heads/master
Commit: 38eaf47fa7dd4b0b3b822e73c9e644370a5cacb6
Parents: d35d837
Author: Michael Stack 
Authored: Mon Oct 2 11:38:11 2017 -0700
Committer: Michael Stack 
Committed: Mon Oct 2 11:38:11 2017 -0700

--
 .../src/main/protobuf/MasterProcedure.proto |  4 +--
 .../src/main/protobuf/RegionServerStatus.proto  |  6 ++--
 .../hbase/coprocessor/MasterObserver.java   | 12 +++
 .../hbase/master/MasterCoprocessorHost.java | 12 +++
 .../master/assignment/AssignmentManager.java|  2 --
 .../assignment/SplitTableRegionProcedure.java   | 29 -
 .../hbase/coprocessor/TestMasterObserver.java   |  4 +--
 .../TestMergeTableRegionsProcedure.java | 29 +
 .../TestSplitTableRegionProcedure.java  | 33 
 .../MasterProcedureTestingUtility.java  |  2 +-
 .../TestSplitTransactionOnCluster.java  |  2 +-
 11 files changed, 99 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/38eaf47f/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 2cdebb1..626530f 100644
--- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto
@@ -286,9 +286,9 @@ enum SplitTableRegionState {
   SPLIT_TABLE_REGION_PRE_OPERATION = 2;
   SPLIT_TABLE_REGION_CLOSE_PARENT_REGION = 3;
   SPLIT_TABLE_REGION_CREATE_DAUGHTER_REGIONS = 4;
-  SPLIT_TABLE_REGION_PRE_OPERATION_BEFORE_PONR = 5;
+  SPLIT_TABLE_REGION_PRE_OPERATION_BEFORE_META = 5;
   SPLIT_TABLE_REGION_UPDATE_META = 6;
-  SPLIT_TABLE_REGION_PRE_OPERATION_AFTER_PONR = 7;
+  SPLIT_TABLE_REGION_PRE_OPERATION_AFTER_META = 7;
   SPLIT_TABLE_REGION_OPEN_CHILD_REGIONS = 8;
   SPLIT_TABLE_REGION_POST_OPERATION = 9;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/38eaf47f/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
--
diff --git a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto 
b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
index 1cd4376..f83bb20 100644
--- a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto
@@ -105,11 +105,13 @@ message RegionStateTransition {
 READY_TO_SPLIT = 3;
 READY_TO_MERGE = 4;
 
-SPLIT_PONR = 5;
-MERGE_PONR = 6;
 
+/** We used to have PONR enums for split and merge in here occupying
+ positions 5 and 6 but they have since been removed. Do not reuse these
+ indices */
 SPLIT = 7;
 MERGED = 8;
+
 SPLIT_REVERTED = 9;
 MERGE_REVERTED = 10;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/38eaf47f/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
index bfa88e6..85da610 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
@@ -696,25 +696,25 @@ public interface MasterObserver {
   final RegionInfo regionInfoB) throws IOException {}
 
   /**
-   * This will be called before PONR step as part of split transaction. Calling
+   * This will be called before update META step as part of split transaction. 
Calling
* {@link org.apache.hadoop.hbase.coprocessor.ObserverContext#bypass()} 
rollback the split
* @param ctx the environment to interact with the framework and master
* @param splitKey
* @param metaEntries
*/
-  default void preSplitRegionBeforePONRAction(
+  default void preSplitRegionBeforeMETAAction(
   final ObserverContext ctx,
   final byte[] splitKey,
   final List metaEntries) throws IOException {}
 
 
   /**
-   * This will be called after PONR step as part of split transaction
+   * This will be called