HBASE-15571 Make MasterProcedureManagerHost 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/8c7f044e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c7f044e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c7f044e Branch: refs/heads/HBASE-14850 Commit: 8c7f044efbb8a84561d28a221343c7b65263934e Parents: bcc4444 Author: tedyu <yuzhih...@gmail.com> Authored: Thu Mar 31 15:45:46 2016 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Thu Mar 31 15:45:46 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/master/HMaster.java | 9 ++++++++- .../org/apache/hadoop/hbase/master/MasterRpcServices.java | 6 +++--- .../java/org/apache/hadoop/hbase/master/MasterServices.java | 6 ++++++ .../org/apache/hadoop/hbase/master/TestCatalogJanitor.java | 6 ++++++ 4 files changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7f044e/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 9829a85..3b5af42 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 @@ -334,7 +334,7 @@ public class HMaster extends HRegionServer implements MasterServices { // monitor for snapshot of hbase tables SnapshotManager snapshotManager; // monitor for distributed procedures - MasterProcedureManagerHost mpmHost; + private MasterProcedureManagerHost mpmHost; // it is assigned after 'initialized' guard set to true, so should be volatile private volatile MasterQuotaManager quotaManager; @@ -2466,6 +2466,13 @@ public class HMaster extends HRegionServer implements MasterServices { return this.snapshotManager; } + /** + * @return the underlying MasterProcedureManagerHost + */ + public MasterProcedureManagerHost getMasterProcedureManagerHost() { + return mpmHost; + } + @Override public ClusterSchema getClusterSchema() { return this.clusterSchemaService; http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7f044e/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index 6a60c2c..cdadff4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -641,7 +641,7 @@ public class MasterRpcServices extends RSRpcServices try { master.checkInitialized(); ProcedureDescription desc = request.getProcedure(); - MasterProcedureManager mpm = master.mpmHost.getProcedureManager( + MasterProcedureManager mpm = master.getMasterProcedureManagerHost().getProcedureManager( desc.getSignature()); if (mpm == null) { throw new ServiceException("The procedure is not registered: " @@ -676,7 +676,7 @@ public class MasterRpcServices extends RSRpcServices try { master.checkInitialized(); ProcedureDescription desc = request.getProcedure(); - MasterProcedureManager mpm = master.mpmHost.getProcedureManager( + MasterProcedureManager mpm = master.getMasterProcedureManagerHost().getProcedureManager( desc.getSignature()); if (mpm == null) { throw new ServiceException("The procedure is not registered: " @@ -894,7 +894,7 @@ public class MasterRpcServices extends RSRpcServices try { master.checkInitialized(); ProcedureDescription desc = request.getProcedure(); - MasterProcedureManager mpm = master.mpmHost.getProcedureManager( + MasterProcedureManager mpm = master.getMasterProcedureManagerHost().getProcedureManager( desc.getSignature()); if (mpm == null) { throw new ServiceException("The procedure is not registered: " http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7f044e/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 4d71117..d6802fe 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 @@ -35,6 +35,7 @@ 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.procedure.MasterProcedureManagerHost; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.quotas.MasterQuotaManager; import org.apache.hadoop.hbase.security.User; @@ -52,6 +53,11 @@ public interface MasterServices extends Server { SnapshotManager getSnapshotManager(); /** + * @return the underlying MasterProcedureManagerHost + */ + MasterProcedureManagerHost getMasterProcedureManagerHost(); + + /** * @return Master's instance of {@link ClusterSchema} */ ClusterSchema getClusterSchema(); http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7f044e/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 65bc50d..e417c8e 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 @@ -65,6 +65,7 @@ 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.procedure.MasterProcedureManagerHost; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; @@ -249,6 +250,11 @@ public class TestCatalogJanitor { } @Override + public MasterProcedureManagerHost getMasterProcedureManagerHost() { + return null; + } + + @Override public AssignmentManager getAssignmentManager() { return this.asm; }
