You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2016/08/24 13:51:53 UTC
[4/4] hbase git commit: HBASE-16270 Handle duplicate clearing of
snapshot in region replicas (Robert Yokota)
HBASE-16270 Handle duplicate clearing of snapshot in region replicas (Robert Yokota)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dca60dbc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dca60dbc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dca60dbc
Branch: refs/heads/branch-1.1
Commit: dca60dbc566c6693269718e469021cdb9999bfce
Parents: 43c93d4
Author: Enis Soztutar <en...@apache.org>
Authored: Wed Aug 24 06:43:19 2016 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Wed Aug 24 06:47:17 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/dca60dbc/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
index 7787b23..4fa755b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
@@ -185,6 +185,7 @@ public class DefaultMemStore implements MemStore {
@Override
public void clearSnapshot(long id) throws UnexpectedStateException {
MemStoreLAB tmpAllocator = null;
+ if (this.snapshotId == -1) return; // already cleared
if (this.snapshotId != id) {
throw new UnexpectedStateException("Current snapshot id is " + this.snapshotId + ",passed "
+ id);