You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/10/26 13:29:40 UTC
hbase git commit: Revert "HBASE-20973 ArrayIndexOutOfBoundsException
when rolling back procedure"
Repository: hbase
Updated Branches:
refs/heads/master 23b7510ae -> 385e39810
Revert "HBASE-20973 ArrayIndexOutOfBoundsException when rolling back procedure"
This reverts commit 3b68e5393edba011146962c7457faffc1e3c0ee7.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/385e3981
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/385e3981
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/385e3981
Branch: refs/heads/master
Commit: 385e39810f4114393c6dbd4cc3a7c3fdaafee7f7
Parents: 23b7510
Author: zhangduo <zh...@apache.org>
Authored: Fri Oct 26 21:27:19 2018 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Fri Oct 26 21:27:19 2018 +0800
----------------------------------------------------------------------
.../procedure2/store/ProcedureStoreTracker.java | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/385e3981/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;