Repository: hbase Updated Branches: refs/heads/branch-1.3 bccc706d6 -> b6f4f511a
HBASE-19790 Fix compatibility break in 1.3.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b6f4f511 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b6f4f511 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b6f4f511 Branch: refs/heads/branch-1.3 Commit: b6f4f511a6ab4491df526efd70ef7736812eb924 Parents: bccc706 Author: Andrew Purtell <[email protected]> Authored: Fri Jan 12 17:02:43 2018 -0800 Committer: Andrew Purtell <[email protected]> Committed: Fri Jan 12 17:29:59 2018 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 1 - .../java/org/apache/hadoop/hbase/regionserver/Region.java | 7 ------- .../regionserver/snapshot/FlushSnapshotSubprocedure.java | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b6f4f511/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 9c75ef8..02ef800 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 @@ -8439,7 +8439,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi closeRegionOperation(Operation.ANY); } - @Override public void closeRegionOperation(Operation operation) throws IOException { if (operation == Operation.SNAPSHOT) { for (Store store: stores.values()) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b6f4f511/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java index 59c1999..672d6ec 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java @@ -251,13 +251,6 @@ public interface Region extends ConfigurationObserver { */ void closeRegionOperation() throws IOException; - /** - * Closes the region operation lock. This needs to be called in the finally block corresponding - * to the try block of {@link #startRegionOperation(Operation)} - * @throws IOException - */ - void closeRegionOperation(Operation op) throws IOException; - // Row write locks /** http://git-wip-us.apache.org/repos/asf/hbase/blob/b6f4f511/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/FlushSnapshotSubprocedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/FlushSnapshotSubprocedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/FlushSnapshotSubprocedure.java index c56204d..4a4bb4f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/FlushSnapshotSubprocedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/snapshot/FlushSnapshotSubprocedure.java @@ -143,7 +143,7 @@ public class FlushSnapshotSubprocedure extends Subprocedure { } } finally { LOG.debug("Closing snapshot operation on " + region); - region.closeRegionOperation(Operation.SNAPSHOT); + ((HRegion)region).closeRegionOperation(Operation.SNAPSHOT); } return null; }
