HBASE-15776 Replace master.am.getTableStateManager() with the direct master.getTableStateManager()
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/513ca348 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/513ca348 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/513ca348 Branch: refs/heads/hbase-12439 Commit: 513ca3483f1d32450ffa0c034e7a7f97b63ff582 Parents: 56358a0 Author: Matteo Bertozzi <matteo.berto...@cloudera.com> Authored: Fri May 6 19:30:45 2016 -0700 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Fri May 6 19:30:45 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/master/HMaster.java | 10 +++++----- .../hbase/master/procedure/AddColumnFamilyProcedure.java | 2 +- .../hbase/master/procedure/CreateTableProcedure.java | 2 +- .../master/procedure/DeleteColumnFamilyProcedure.java | 2 +- .../hbase/master/procedure/DeleteTableProcedure.java | 4 ++-- .../hbase/master/procedure/DisableTableProcedure.java | 7 +++---- .../hbase/master/procedure/EnableTableProcedure.java | 6 +++--- .../hbase/master/procedure/MasterDDLOperationHelper.java | 2 +- .../master/procedure/ModifyColumnFamilyProcedure.java | 2 +- .../hbase/master/procedure/ModifyTableProcedure.java | 4 ++-- .../hadoop/hbase/master/snapshot/SnapshotManager.java | 6 ++---- .../java/org/apache/hadoop/hbase/client/TestAdmin1.java | 6 +++--- .../java/org/apache/hadoop/hbase/master/TestMaster.java | 3 +-- .../master/TestMasterRestartAfterDisablingTable.java | 8 ++++---- .../master/procedure/MasterProcedureTestingUtility.java | 4 ++-- 15 files changed, 32 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/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 c2cab33..3829b35 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 @@ -944,10 +944,11 @@ public class HMaster extends HRegionServer implements MasterServices { assigned++; } - if (replicaId == HRegionInfo.DEFAULT_REPLICA_ID) + if (replicaId == HRegionInfo.DEFAULT_REPLICA_ID) { + // TODO: should we prevent from using state manager before meta was initialized? + // tableStateManager.start(); getTableStateManager().setTableState(TableName.META_TABLE_NAME, TableState.State.ENABLED); - // TODO: should we prevent from using state manager before meta was initialized? - // tableStateManager.start(); + } if ((RecoveryMode.LOG_REPLAY == this.getMasterWalManager().getLogRecoveryMode()) && (!previouslyFailedMetaRSs.isEmpty())) { @@ -2096,8 +2097,7 @@ public class HMaster extends HRegionServer implements MasterServices { if (!MetaTableAccessor.tableExists(getConnection(), tableName)) { throw new TableNotFoundException(tableName); } - if (!getAssignmentManager().getTableStateManager(). - isTableState(tableName, TableState.State.DISABLED)) { + if (!getTableStateManager().isTableState(tableName, TableState.State.DISABLED)) { throw new TableNotDisabledException(tableName); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java index 4a6c67d..ce099ed 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java @@ -339,7 +339,7 @@ public class AddColumnFamilyProcedure */ private void reOpenAllRegionsIfTableIsOnline(final MasterProcedureEnv env) throws IOException { // This operation only run when the table is enabled. - if (!env.getMasterServices().getAssignmentManager().getTableStateManager() + if (!env.getMasterServices().getTableStateManager() .isTableState(getTableName(), TableState.State.ENABLED)) { return; } http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java index 110bccd..03d433b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java @@ -450,7 +450,7 @@ public class CreateTableProcedure ModifyRegionUtils.assignRegions(assignmentManager, regions); // Enable table - assignmentManager.getTableStateManager() + env.getMasterServices().getTableStateManager() .setTableState(tableName, TableState.State.ENABLED); } http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java index 1e510b3..097aaf1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java @@ -364,7 +364,7 @@ public class DeleteColumnFamilyProcedure */ private void reOpenAllRegionsIfTableIsOnline(final MasterProcedureEnv env) throws IOException { // This operation only run when the table is enabled. - if (!env.getMasterServices().getAssignmentManager().getTableStateManager() + if (!env.getMasterServices().getTableStateManager() .isTableState(getTableName(), TableState.State.ENABLED)) { return; } http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java index 4c92fb5..39ec0a6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java @@ -402,7 +402,7 @@ public class DeleteTableProcedure protected static void deleteAssignmentState(final MasterProcedureEnv env, final TableName tableName) throws IOException { - AssignmentManager am = env.getMasterServices().getAssignmentManager(); + final AssignmentManager am = env.getMasterServices().getAssignmentManager(); // Clean up regions of the table in RegionStates. LOG.debug("Removing '" + tableName + "' from region states."); @@ -410,7 +410,7 @@ public class DeleteTableProcedure // If entry for this table states, remove it. LOG.debug("Marking '" + tableName + "' as deleted."); - am.getTableStateManager().setDeletedTable(tableName); + env.getMasterServices().getTableStateManager().setDeletedTable(tableName); } protected static void deleteTableDescriptorCache(final MasterProcedureEnv env, http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java index 6a65690..5518b8b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java @@ -289,8 +289,7 @@ public class DisableTableProcedure // the state to DISABLING from ENABLED. The implementation was done before table lock // was implemented. With table lock, there is no need to set the state here (it will // set the state later on). A quick state check should be enough for us to move forward. - TableStateManager tsm = - env.getMasterServices().getAssignmentManager().getTableStateManager(); + TableStateManager tsm = env.getMasterServices().getTableStateManager(); TableState.State state = tsm.getTableState(tableName); if(!state.equals(TableState.State.ENABLED)){ LOG.info("Table " + tableName + " isn't enabled;is "+state.name()+"; skipping disable"); @@ -327,7 +326,7 @@ public class DisableTableProcedure final MasterProcedureEnv env, final TableName tableName) throws IOException { // Set table disabling flag up in zk. - env.getMasterServices().getAssignmentManager().getTableStateManager().setTableState( + env.getMasterServices().getTableStateManager().setTableState( tableName, TableState.State.DISABLING); } @@ -418,7 +417,7 @@ public class DisableTableProcedure final MasterProcedureEnv env, final TableName tableName) throws IOException { // Flip the table to disabled - env.getMasterServices().getAssignmentManager().getTableStateManager().setTableState( + env.getMasterServices().getTableStateManager().setTableState( tableName, TableState.State.DISABLED); LOG.info("Disabled table, " + tableName + ", is completed."); http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java index 862231e..141dcd4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java @@ -310,7 +310,7 @@ public class EnableTableProcedure // the state to ENABLING from DISABLED. The implementation was done before table lock // was implemented. With table lock, there is no need to set the state here (it will // set the state later on). A quick state check should be enough for us to move forward. - TableStateManager tsm = env.getMasterServices().getAssignmentManager().getTableStateManager(); + TableStateManager tsm = env.getMasterServices().getTableStateManager(); TableState.State state = tsm.getTableState(tableName); if(!state.equals(TableState.State.DISABLED)){ LOG.info("Table " + tableName + " isn't disabled;is "+state.name()+"; skipping enable"); @@ -349,7 +349,7 @@ public class EnableTableProcedure final TableName tableName) throws IOException { // Set table disabling flag up in zk. LOG.info("Attempting to enable the table " + tableName); - env.getMasterServices().getAssignmentManager().getTableStateManager().setTableState( + env.getMasterServices().getTableStateManager().setTableState( tableName, TableState.State.ENABLING); } @@ -494,7 +494,7 @@ public class EnableTableProcedure final MasterProcedureEnv env, final TableName tableName) throws IOException { // Flip the table to Enabled - env.getMasterServices().getAssignmentManager().getTableStateManager().setTableState( + env.getMasterServices().getTableStateManager().setTableState( tableName, TableState.State.ENABLED); LOG.info("Table '" + tableName + "' was successfully enabled."); http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java index 19bd015..f2ee97f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java @@ -77,7 +77,7 @@ public final class MasterDDLOperationHelper { } // We only execute this procedure with table online if online schema change config is set. - if (!env.getMasterServices().getAssignmentManager().getTableStateManager() + if (!env.getMasterServices().getTableStateManager() .isTableState(tableName, TableState.State.DISABLED) && !MasterDDLOperationHelper.isOnlineSchemaChangeAllowed(env)) { throw new TableNotDisabledException(tableName); http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java index 0b7d8a2..ee534e9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java @@ -319,7 +319,7 @@ public class ModifyColumnFamilyProcedure */ private void reOpenAllRegionsIfTableIsOnline(final MasterProcedureEnv env) throws IOException { // This operation only run when the table is enabled. - if (!env.getMasterServices().getAssignmentManager().getTableStateManager() + if (!env.getMasterServices().getTableStateManager() .isTableState(getTableName(), TableState.State.ENABLED)) { return; } http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java index 8f088da..3f76df3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java @@ -298,7 +298,7 @@ public class ModifyTableProcedure this.unmodifiedHTableDescriptor = env.getMasterServices().getTableDescriptors().get(getTableName()); - if (env.getMasterServices().getAssignmentManager().getTableStateManager() + if (env.getMasterServices().getTableStateManager() .isTableState(getTableName(), TableState.State.ENABLED)) { // We only execute this procedure with table online if online schema change config is set. if (!MasterDDLOperationHelper.isOnlineSchemaChangeAllowed(env)) { @@ -437,7 +437,7 @@ public class ModifyTableProcedure */ private void reOpenAllRegionsIfTableIsOnline(final MasterProcedureEnv env) throws IOException { // This operation only run when the table is enabled. - if (!env.getMasterServices().getAssignmentManager().getTableStateManager() + if (!env.getMasterServices().getTableStateManager() .isTableState(getTableName(), TableState.State.ENABLED)) { return; } http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java index 8ef63fb..0304e38 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java @@ -48,7 +48,6 @@ import org.apache.hadoop.hbase.client.TableState; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.ipc.RpcServer; -import org.apache.hadoop.hbase.master.AssignmentManager; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.master.MasterServices; @@ -582,15 +581,14 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable // if the table is enabled, then have the RS run actually the snapshot work TableName snapshotTable = TableName.valueOf(snapshot.getTable()); - AssignmentManager assignmentMgr = master.getAssignmentManager(); - if (assignmentMgr.getTableStateManager().isTableState(snapshotTable, + if (master.getTableStateManager().isTableState(snapshotTable, TableState.State.ENABLED)) { LOG.debug("Table enabled, starting distributed snapshot."); snapshotEnabledTable(snapshot); LOG.debug("Started snapshot: " + ClientSnapshotDescriptionUtils.toString(snapshot)); } // For disabled table, snapshot is created by the master - else if (assignmentMgr.getTableStateManager().isTableState(snapshotTable, + else if (master.getTableStateManager().isTableState(snapshotTable, TableState.State.DISABLED)) { LOG.debug("Table is disabled, running snapshot entirely on master."); snapshotDisabledTable(snapshot); http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java index 10dbed0..ce48032 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java @@ -249,7 +249,7 @@ public class TestAdmin1 { this.admin.disableTable(ht.getName()); assertTrue("Table must be disabled.", TEST_UTIL.getHBaseCluster() - .getMaster().getAssignmentManager().getTableStateManager().isTableState( + .getMaster().getTableStateManager().isTableState( ht.getName(), TableState.State.DISABLED)); assertEquals(TableState.State.DISABLED, getStateFromMeta(table)); @@ -277,7 +277,7 @@ public class TestAdmin1 { assertTrue(ok); this.admin.enableTable(table); assertTrue("Table must be enabled.", TEST_UTIL.getHBaseCluster() - .getMaster().getAssignmentManager().getTableStateManager().isTableState( + .getMaster().getTableStateManager().isTableState( ht.getName(), TableState.State.ENABLED)); assertEquals(TableState.State.ENABLED, getStateFromMeta(table)); @@ -365,7 +365,7 @@ public class TestAdmin1 { tables = this.admin.listTables(); assertEquals(numTables + 1, tables.length); assertTrue("Table must be enabled.", - TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager().getTableStateManager() + TEST_UTIL.getHBaseCluster().getMaster().getTableStateManager() .isTableState(tableName, TableState.State.ENABLED)); assertEquals(TableState.State.ENABLED, getStateFromMeta(tableName)); } http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java index 99e0e3f..c03afbc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java @@ -84,8 +84,7 @@ public class TestMaster { HMaster m = cluster.getMaster(); try (Table ht = TEST_UTIL.createTable(TABLENAME, FAMILYNAME)) { - assertTrue(m.assignmentManager.getTableStateManager().isTableState(TABLENAME, - TableState.State.ENABLED)); + assertTrue(m.getTableStateManager().isTableState(TABLENAME, TableState.State.ENABLED)); TEST_UTIL.loadTable(ht, FAMILYNAME, false); } http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java index d4250e3..b62279e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java @@ -95,8 +95,8 @@ public class TestMasterRestartAfterDisablingTable { cluster.hbaseCluster.waitOnMaster(activeMaster); cluster.waitForActiveAndReadyMaster(); - assertTrue("The table should not be in enabled state", cluster.getMaster() - .getAssignmentManager().getTableStateManager().isTableState( + assertTrue("The table should not be in enabled state", + cluster.getMaster().getTableStateManager().isTableState( TableName.valueOf("tableRestart"), TableState.State.DISABLED, TableState.State.DISABLING)); log("Enabling table\n"); @@ -111,8 +111,8 @@ public class TestMasterRestartAfterDisablingTable { assertEquals("The assigned regions were not onlined after master" + " switch except for the catalog and namespace tables.", 6, regions.size()); - assertTrue("The table should be in enabled state", cluster.getMaster() - .getAssignmentManager().getTableStateManager() + assertTrue("The table should be in enabled state", + cluster.getMaster().getTableStateManager() .isTableState(TableName.valueOf("tableRestart"), TableState.State.ENABLED)); ht.close(); TEST_UTIL.shutdownMiniCluster(); http://git-wip-us.apache.org/repos/asf/hbase/blob/513ca348/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java index 430a017..68a22a8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.java @@ -182,13 +182,13 @@ public class MasterProcedureTestingUtility { public static void validateTableIsEnabled(final HMaster master, final TableName tableName) throws IOException { - TableStateManager tsm = master.getAssignmentManager().getTableStateManager(); + TableStateManager tsm = master.getTableStateManager(); assertTrue(tsm.getTableState(tableName).equals(TableState.State.ENABLED)); } public static void validateTableIsDisabled(final HMaster master, final TableName tableName) throws IOException { - TableStateManager tsm = master.getAssignmentManager().getTableStateManager(); + TableStateManager tsm = master.getTableStateManager(); assertTrue(tsm.getTableState(tableName).equals(TableState.State.DISABLED)); }
