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/fefb8e85 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fefb8e85 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fefb8e85 Branch: refs/heads/branch-1.2 Commit: fefb8e8513f6eac93cd89cd2a2cf4a8874a33116 Parents: 4dcd7fb Author: Enis Soztutar <e...@apache.org> Authored: Wed Aug 24 06:43:19 2016 -0700 Committer: Enis Soztutar <e...@apache.org> Committed: Wed Aug 24 06:45:40 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/fefb8e85/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 f8fc397..80501ee 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 @@ -189,6 +189,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);
