Repository: hbase Updated Branches: refs/heads/HBASE-7912 524edfdbd -> 15b257a88
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/15b257a8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/15b257a8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/15b257a8 Branch: refs/heads/HBASE-7912 Commit: 15b257a881d94dfe9c54067a2c9a2101010f48dc Parents: 524edfd Author: tedyu <[email protected]> Authored: Fri Mar 25 07:41:43 2016 -0700 Committer: tedyu <[email protected]> Committed: Fri Mar 25 07:41:43 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/15b257a8/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 89cfd18..656784b 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 @@ -2444,10 +2444,9 @@ public class HMaster extends HRegionServer implements MasterServices { } /** - * 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/15b257a8/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 59c7a88..d32297c 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 @@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.master.normalizer.RegionNormalizer; 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.quotas.MasterQuotaManager; import org.apache.hadoop.hbase.security.User; @@ -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 {@link ClusterSchema} */ ClusterSchema getClusterSchema(); http://git-wip-us.apache.org/repos/asf/hbase/blob/15b257a8/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 123e8b5..a483311 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.io.Reference; import org.apache.hadoop.hbase.master.CatalogJanitor.SplitParentFirstComparator; import org.apache.hadoop.hbase.master.normalizer.RegionNormalizer; 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; @@ -243,6 +244,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/15b257a8/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 a6b6e4c..b95089b 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 @@ -131,7 +131,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 @@ -185,7 +185,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
