HBASE-15526 Make SnapshotManager accessible through MasterServices
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1c823ae5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1c823ae5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1c823ae5 Branch: refs/heads/branch-1.3 Commit: 1c823ae5c7d267817150396f7de906ce829b805f Parents: 6ba2ada Author: tedyu <yuzhih...@gmail.com> Authored: Thu Mar 24 16:02:00 2016 -0700 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Mon May 9 20:26:51 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 3 +-- .../java/org/apache/hadoop/hbase/master/MasterServices.java | 6 ++++++ .../org/apache/hadoop/hbase/master/TestCatalogJanitor.java | 6 ++++++ .../hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1c823ae5/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 126a391..9323c36 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -2480,10 +2480,9 @@ public class HMaster extends HRegionServer implements MasterServices, Server { } /** - * Exposed for TESTING! * @return the underlying snapshot manager */ - public SnapshotManager getSnapshotManagerForTesting() { + public SnapshotManager getSnapshotManager() { return this.snapshotManager; } http://git-wip-us.apache.org/repos/asf/hbase/blob/1c823ae5/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java index cd6b375..a1bcd7d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableNotDisabledException; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv; +import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.quotas.MasterQuotaManager; @@ -46,6 +47,11 @@ import com.google.protobuf.Service; @InterfaceAudience.Private public interface MasterServices extends Server { /** + * @return the underlying snapshot manager + */ + SnapshotManager getSnapshotManager(); + + /** * @return Master's instance of the {@link AssignmentManager} */ AssignmentManager getAssignmentManager(); http://git-wip-us.apache.org/repos/asf/hbase/blob/1c823ae5/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java index 6dc0eb9..2d1c0e8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java @@ -64,6 +64,7 @@ import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.io.Reference; import org.apache.hadoop.hbase.master.CatalogJanitor.SplitParentFirstComparator; import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv; +import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; @@ -236,6 +237,11 @@ public class TestCatalogJanitor { } @Override + public SnapshotManager getSnapshotManager() { + return null; + } + + @Override public AssignmentManager getAssignmentManager() { return this.asm; } http://git-wip-us.apache.org/repos/asf/hbase/blob/1c823ae5/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java index 42be207..0bffa92 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java @@ -130,7 +130,7 @@ public class TestSnapshotFromMaster { @Before public void setup() throws Exception { UTIL.createTable(TABLE_NAME, TEST_FAM); - master.getSnapshotManagerForTesting().setSnapshotHandlerForTesting(TABLE_NAME, null); + master.getSnapshotManager().setSnapshotHandlerForTesting(TABLE_NAME, null); } @After @@ -184,7 +184,7 @@ public class TestSnapshotFromMaster { Mockito.when(mockHandler.getCompletionTimestamp()) .thenReturn(EnvironmentEdgeManager.currentTime()); - master.getSnapshotManagerForTesting() + master.getSnapshotManager() .setSnapshotHandlerForTesting(TABLE_NAME, mockHandler); // if we do a lookup without a snapshot name, we should fail - you should always know your name
