Repository: hbase
Updated Branches:
refs/heads/0.98 9e720ef07 -> a3a2860b1
refs/heads/branch-1 4588b7ab9 -> 0b6d9b25f
refs/heads/branch-1.0 be5a8c51d -> fbf66b48b
refs/heads/branch-1.1 cadf432c8 -> e585cd8e1
refs/heads/branch-1.2 911c30b4a -> adcb905a0
refs/heads/master 45aafb25b -> ecba08829
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/ecba0882
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ecba0882
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ecba0882
Branch: refs/heads/master
Commit: ecba08829da149aca11929b5b88a6df880e0da35
Parents: 45aafb2
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:04 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/ecba0882/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 37d0f08..df8bcf5 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
@@ -1444,7 +1444,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
HBASE-10844 Coprocessor failure during batchmutation leaves the memstore datastructs in an inconsistent state
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
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/fbf66b48
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fbf66b48
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fbf66b48
Branch: refs/heads/branch-1.0
Commit: fbf66b48b3f17c3310ad42b8b274a1ce3020c6b6
Parents: be5a8c5
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:56:20 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/fbf66b48/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 a50b8fb..22213ea 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
@@ -1303,7 +1303,14 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
// close each store in parallel
for (final Store store : stores.values()) {
- assert abort || store.getFlushableSize() == 0;
+ long flushableSize = store.getFlushableSize();
+ if (!(abort || flushableSize == 0)) {
+ 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
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/e585cd8e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e585cd8e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e585cd8e
Branch: refs/heads/branch-1.1
Commit: e585cd8e18dd8d7f6b738bbad490222c3ab4fcbc
Parents: cadf432
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:56:02 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/e585cd8e/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 66f52dc..1605c6f 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
@@ -1437,7 +1437,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
HBASE-10844 Coprocessor failure during batchmutation leaves the memstore datastructs in an inconsistent state
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
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/a3a2860b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a3a2860b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a3a2860b
Branch: refs/heads/0.98
Commit: a3a2860b16ebaf4f05f9a5eb8b0d2fd22252fe8b
Parents: 9e720ef
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:56:35 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/a3a2860b/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 c58303b..df7f977 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
@@ -1227,7 +1227,14 @@ public class HRegion implements HeapSize { // , Writable{
// close each store in parallel
for (final Store store : stores.values()) {
- assert abort? true: store.getFlushableSize() == 0;
+ long flushableSize = store.getFlushableSize();
+ if (!(abort || flushableSize == 0)) {
+ 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
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/adcb905a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/adcb905a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/adcb905a
Branch: refs/heads/branch-1.2
Commit: adcb905a0d30bdd27aa7439e336e0cf95f6dbae9
Parents: 911c30b
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:50 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/adcb905a/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
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