Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-15571 Make MasterProcedureManagerHost accessible through MasterServices

This commit is contained in:
tedyu 2016-03-31 15:49:07 -07:00
parent 407e644607
commit b7df66f1a8
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -326,7 +326,7 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
// 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;
@ -2484,6 +2484,13 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
return this.snapshotManager;
}
/**
* @return the underlying MasterProcedureManagerHost
*/
public MasterProcedureManagerHost getMasterProcedureManagerHost() {
return mpmHost;
}
@Override
public void createNamespace(
final NamespaceDescriptor descriptor,

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
View File

@ -725,7 +725,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: "
@ -760,7 +760,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: "
@ -963,7 +963,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: "

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
View File

@ -34,6 +34,7 @@ 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.procedure.MasterProcedureManagerHost;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
import org.apache.hadoop.hbase.executor.ExecutorService;
import org.apache.hadoop.hbase.quotas.MasterQuotaManager;
@ -51,6 +52,11 @@ public interface MasterServices extends Server {
*/
SnapshotManager getSnapshotManager();
/**
* @return the underlying MasterProcedureManagerHost
*/
MasterProcedureManagerHost getMasterProcedureManagerHost();
/**
* @return Master's instance of the {@link AssignmentManager}
*/

6
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
View File

@ -65,6 +65,7 @@ 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.procedure.MasterProcedureManagerHost;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos;
@ -241,6 +242,11 @@ public class TestCatalogJanitor {
return null;
}
@Override
public MasterProcedureManagerHost getMasterProcedureManagerHost() {
return null;
}
@Override
public AssignmentManager getAssignmentManager() {
return this.asm;