You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/03/24 23:59:56 UTC
hbase git commit: HBASE-15526 Make SnapshotManager accessible through
MasterServices
Repository: hbase
Updated Branches:
refs/heads/master ad3feaa44 -> 07c597c8a
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/07c597c8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/07c597c8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/07c597c8
Branch: refs/heads/master
Commit: 07c597c8a2fe4f5b2b5412eea479b75e37de8f1a
Parents: ad3feaa
Author: tedyu <yu...@gmail.com>
Authored: Thu Mar 24 15:59:46 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Thu Mar 24 15:59:46 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/07c597c8/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 7942b28..221dcd5 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
@@ -2452,10 +2452,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/07c597c8/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 8ce21b0..4d71117 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/07c597c8/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 2949369..65bc50d 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/07c597c8/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