You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/08/15 01:07:34 UTC
[3/6] hbase git commit: HBASE-10844 Coprocessor failure during
batchmutation leaves the memstore datastructs in an inconsistent state
HBASE-10844 Coprocessor failure during batchmutation leaves the memstore datastructs in an inconsistent state
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0b6d9b25
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0b6d9b25
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0b6d9b25
Branch: refs/heads/branch-1
Commit: 0b6d9b25f59f2b5e858d008222084f31b2cee145
Parents: 4588b7a
Author: Nick Dimiduk <nd...@apache.org>
Authored: Thu Aug 13 16:19:26 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Aug 14 15:55:58 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0b6d9b25/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 2c23639..709e890 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -1446,7 +1446,14 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
// close each store in parallel
for (final Store store : stores.values()) {
- assert abort || store.getFlushableSize() == 0 || writestate.readOnly;
+ long flushableSize = store.getFlushableSize();
+ if (!(abort || flushableSize == 0 || writestate.readOnly)) {
+ getRegionServerServices().abort("Assertion failed while closing store "
+ + getRegionInfo().getRegionNameAsString() + " " + store
+ + ". flushableSize expected=0, actual= " + flushableSize
+ + ". Current memstoreSize=" + getMemstoreSize() + ". Maybe a coprocessor "
+ + "operation failed and left the memstore in a partially updated state.", null);
+ }
completionService
.submit(new Callable<Pair<byte[], Collection<StoreFile>>>() {
@Override