hbase-commits mailing list archives

Repository: hbase
Updated Branches:
  refs/heads/branch-2.1 940326d8f -> 9a151ec77


Revert "HBASE-20973 ArrayIndexOutOfBoundsException when rolling back procedure"

This reverts commit e29ce9f93753d79edfa4e8b864c31c34e33ea635.


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

Branch: refs/heads/branch-2.1
Commit: 9a151ec77b66dec2d28dc571dbefe5b30415e9c4
Parents: 940326d
Author: zhangduo <zhangduo@apache.org>
Authored: Fri Oct 26 21:28:06 2018 +0800
Committer: zhangduo <zhangduo@apache.org>
Committed: Fri Oct 26 21:30:10 2018 +0800

----------------------------------------------------------------------
 .../procedure2/store/ProcedureStoreTracker.java   | 18 ------------------
 1 file changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/9a151ec7/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
index a0978e1..1930f8a 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.java
@@ -376,24 +376,6 @@ public class ProcedureStoreTracker {
   }
 
   private BitSetNode getOrCreateNode(long procId) {
-    // See HBASE-20973, grow or merge can lead to ArrayIndexOutOfBoundsException
-    // The root cause is not revealed yet, disable grow or merge for now
-    return getOrCreateNodeNoGrowOrMerge(procId);
-  }
-
-  private BitSetNode getOrCreateNodeNoGrowOrMerge(long procId) {
-    Map.Entry<Long, BitSetNode> entry = map.floorEntry(procId);
-    if (entry != null && entry.getValue().contains(procId)) {
-      return entry.getValue();
-    } else {
-      BitSetNode node = new BitSetNode(procId, partial);
-      assert !map.containsKey(node.getStart());
-      map.put(node.getStart(), node);
-      return node;
-    }
-  }
-
-  private BitSetNode getOrCreateNodeWithGrowOrMerge(long procId) {
     // If procId can fit in left node (directly or by growing it)
     BitSetNode leftNode = null;
     boolean leftCanGrow = false;