diff --git hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java index 22bad72..481e709 100644 --- hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java +++ hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java @@ -310,12 +310,14 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService HRegionInfo[] regions) throws IOException { } + @Deprecated @Override public void preCreateTableHandler(ObserverContext ctx, HTableDescriptor desc, HRegionInfo[] regions) throws IOException { } + @Deprecated @Override public void postCreateTableHandler(ObserverContext ctx, HTableDescriptor desc, @@ -323,21 +325,49 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override + public void preCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { + } + + @Override + public void postCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { + } + + @Override public void preDeleteTable(ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void preDeleteTableHandler(ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postDeleteTableHandler(ObserverContext ctx, TableName tableName) throws IOException { } @Override + public void preDeleteTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException { + } + + @Override + public void postDeleteTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException { + } + + @Override public void preTruncateTable(ObserverContext ctx, TableName tableName) throws IOException { } @@ -347,17 +377,31 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService TableName tableName) throws IOException { } + @Deprecated @Override public void preTruncateTableHandler(ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postTruncateTableHandler(ObserverContext ctx, TableName tableName) throws IOException { } @Override + public void preTruncateTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException { + } + + @Override + public void postTruncateTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException { + } + + @Override public void preModifyTable(ObserverContext ctx, TableName tableName, HTableDescriptor htd) throws IOException { @@ -369,12 +413,14 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService HTableDescriptor htd) throws IOException { } + @Deprecated @Override public void preModifyTableHandler(ObserverContext ctx, TableName tableName, HTableDescriptor htd) throws IOException { } + @Deprecated @Override public void postModifyTableHandler(ObserverContext ctx, TableName tableName, @@ -382,6 +428,20 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override + public void preModifyTableProcedure( + final ObserverContext ctx, + final TableName tableName, + final HTableDescriptor htd) throws IOException { + } + + @Override + public void postModifyTableProcedure( + final ObserverContext ctx, + final TableName tableName, + final HTableDescriptor htd) throws IOException { + } + + @Override public void preAddColumn(ObserverContext ctx, TableName tableName, HColumnDescriptor columnFamily) throws IOException { @@ -405,6 +465,7 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService HColumnDescriptor columnFamily) throws IOException { } + @Deprecated @Override public void preAddColumnHandler(ObserverContext ctx, TableName tableName, @@ -412,11 +473,13 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override - public void preAddColumnFamilyHandler(ObserverContext ctx, - TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void preAddColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } + @Deprecated @Override public void postAddColumnHandler(ObserverContext ctx, TableName tableName, @@ -424,9 +487,10 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override - public void postAddColumnFamilyHandler(ObserverContext ctx, - TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void postAddColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Override @@ -453,6 +517,7 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } + @Deprecated @Override public void preModifyColumnHandler(ObserverContext ctx, TableName tableName, HColumnDescriptor columnFamily) throws IOException { @@ -460,12 +525,15 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override - public void preModifyColumnFamilyHandler(ObserverContext ctx, - TableName tableName, HColumnDescriptor columnFamily) + public void preModifyColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } + @Deprecated @Override public void postModifyColumnHandler(ObserverContext ctx, TableName tableName, HColumnDescriptor columnFamily) throws @@ -474,8 +542,10 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override - public void postModifyColumnFamilyHandler(ObserverContext ctx, - TableName tableName, HColumnDescriptor columnFamily) + public void postModifyColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @@ -504,6 +574,7 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } + @Deprecated @Override public void preDeleteColumnHandler(ObserverContext ctx, TableName tableName, byte[] columnFamily) throws IOException { @@ -511,12 +582,15 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override - public void preDeleteColumnFamilyHandler(ObserverContext ctx, - TableName tableName, byte[] columnFamily) throws + public void preDeleteColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final byte[] columnFamily) throws IOException { } + @Deprecated @Override public void postDeleteColumnHandler(ObserverContext ctx, TableName tableName, byte[] columnFamily) throws IOException { @@ -524,8 +598,10 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override - public void postDeleteColumnFamilyHandler(ObserverContext ctx, - TableName tableName, byte[] columnFamily) throws + public void postDeleteColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final byte[] columnFamily) throws IOException { } @@ -542,12 +618,14 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } + @Deprecated @Override public void preEnableTableHandler(ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postEnableTableHandler(ObserverContext ctx, TableName tableName) throws IOException { @@ -555,6 +633,20 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override + public void preEnableTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException { + + } + + @Override + public void postEnableTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException { + + } + + @Override public void preDisableTable(ObserverContext ctx, TableName tableName) throws IOException { @@ -566,12 +658,14 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } + @Deprecated @Override public void preDisableTableHandler(ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postDisableTableHandler(ObserverContext ctx, TableName tableName) throws IOException { @@ -579,6 +673,20 @@ public class RSGroupAdminEndpoint extends RSGroupAdminService } @Override + public void preDisableTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException { + + } + + @Override + public void postDisableTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException { + + } + + @Override public void preMove(ObserverContext ctx, HRegionInfo region, ServerName srcServer, ServerName destServer) throws IOException { diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java index 65398c2..dc53311 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterAndRegionObserver.java @@ -67,12 +67,14 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver HRegionInfo regionA, HRegionInfo regionB) throws IOException { } + @Deprecated @Override public void preCreateTableHandler( final ObserverContext ctx, HTableDescriptor desc, HRegionInfo[] regions) throws IOException { } + @Deprecated @Override public void postCreateTableHandler( final ObserverContext ctx, @@ -80,6 +82,20 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override + public void preCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { + } + + @Override + public void postCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { + } + + @Override public void preDeleteTable(ObserverContext ctx, TableName tableName) throws IOException { } @@ -89,12 +105,14 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver TableName tableName) throws IOException { } + @Deprecated @Override public void preDeleteTableHandler( final ObserverContext ctx, TableName tableName) throws IOException{ } + @Deprecated @Override public void postDeleteTableHandler( final ObserverContext ctx, TableName tableName) @@ -102,6 +120,18 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override + public void preDeleteTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException{ + } + + @Override + public void postDeleteTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override public void preTruncateTable(ObserverContext ctx, TableName tableName) throws IOException { } @@ -111,12 +141,14 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver TableName tableName) throws IOException { } + @Deprecated @Override public void preTruncateTableHandler( final ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postTruncateTableHandler( final ObserverContext ctx, TableName tableName) @@ -124,16 +156,30 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override + public void preTruncateTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override + public void postTruncateTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override public void preModifyTable(ObserverContext ctx, TableName tableName, HTableDescriptor htd) throws IOException { } + @Deprecated @Override public void postModifyTableHandler( ObserverContext ctx, TableName tableName, HTableDescriptor htd) throws IOException { } + @Deprecated @Override public void preModifyTableHandler( ObserverContext ctx, TableName tableName, @@ -146,6 +192,20 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override + public void preModifyTableProcedure( + final ObserverContext ctx, + final TableName tableName, + final HTableDescriptor htd) throws IOException { + } + + @Override + public void postModifyTableProcedure( + final ObserverContext ctx, + final TableName tableName, + final HTableDescriptor htd) throws IOException { + } + + @Override public void preCreateNamespace(ObserverContext ctx, NamespaceDescriptor ns) throws IOException { } @@ -225,9 +285,10 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override - public void preAddColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void preAddColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Deprecated @@ -238,9 +299,10 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override - public void postAddColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void postAddColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Deprecated @@ -273,9 +335,10 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override - public void preModifyColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void preModifyColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Deprecated @@ -286,9 +349,10 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override - public void postModifyColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void postModifyColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Deprecated @@ -321,9 +385,10 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override - public void preDeleteColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - byte[] columnFamily) throws IOException { + public void preDeleteColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final byte[] columnFamily) throws IOException { } @Deprecated @@ -334,9 +399,10 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override - public void postDeleteColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - byte[] columnFamily) throws IOException { + public void postDeleteColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final byte[] columnFamily) throws IOException { } @@ -350,12 +416,14 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver TableName tableName) throws IOException { } + @Deprecated @Override public void preEnableTableHandler( ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postEnableTableHandler( ObserverContext ctx, TableName tableName) @@ -363,6 +431,18 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override + public void preEnableTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override + public void postEnableTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override public void preDisableTable(ObserverContext ctx, TableName tableName) throws IOException { } @@ -372,12 +452,14 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver TableName tableName) throws IOException { } + @Deprecated @Override public void preDisableTableHandler( ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postDisableTableHandler( ObserverContext ctx, TableName tableName) @@ -385,6 +467,18 @@ public class BaseMasterAndRegionObserver extends BaseRegionObserver } @Override + public void preDisableTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override + public void postDisableTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override public void preAbortProcedure( ObserverContext ctx, final ProcedureExecutor procEnv, diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java index 18c6a0a..dd287a3 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseMasterObserver.java @@ -56,12 +56,14 @@ public class BaseMasterObserver implements MasterObserver { HTableDescriptor desc, HRegionInfo[] regions) throws IOException { } + @Deprecated @Override public void preCreateTableHandler( final ObserverContext ctx, HTableDescriptor desc, HRegionInfo[] regions) throws IOException { } + @Deprecated @Override public void postCreateTableHandler( final ObserverContext ctx, @@ -69,6 +71,20 @@ public class BaseMasterObserver implements MasterObserver { } @Override + public void preCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { + } + + @Override + public void postCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { + } + + @Override public void preDispatchMerge(final ObserverContext ctx, HRegionInfo regionA, HRegionInfo regionB) throws IOException { } @@ -88,12 +104,14 @@ public class BaseMasterObserver implements MasterObserver { TableName tableName) throws IOException { } + @Deprecated @Override public void preDeleteTableHandler( final ObserverContext ctx, TableName tableName) throws IOException{ } + @Deprecated @Override public void postDeleteTableHandler( final ObserverContext ctx, TableName tableName) @@ -101,6 +119,18 @@ public class BaseMasterObserver implements MasterObserver { } @Override + public void preDeleteTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException{ + } + + @Override + public void postDeleteTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override public void preTruncateTable(ObserverContext ctx, TableName tableName) throws IOException { } @@ -110,12 +140,14 @@ public class BaseMasterObserver implements MasterObserver { TableName tableName) throws IOException { } + @Deprecated @Override public void preTruncateTableHandler( final ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postTruncateTableHandler( final ObserverContext ctx, TableName tableName) @@ -123,25 +155,53 @@ public class BaseMasterObserver implements MasterObserver { } @Override + public void preTruncateTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override + public void postTruncateTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override public void preModifyTable(ObserverContext ctx, TableName tableName, HTableDescriptor htd) throws IOException { } @Override - public void postModifyTableHandler( + public void postModifyTable(ObserverContext ctx, + TableName tableName, HTableDescriptor htd) throws IOException { + } + + @Deprecated + @Override + public void preModifyTableHandler( ObserverContext ctx, TableName tableName, HTableDescriptor htd) throws IOException { } + @Deprecated @Override - public void preModifyTableHandler( + public void postModifyTableHandler( ObserverContext ctx, TableName tableName, HTableDescriptor htd) throws IOException { } @Override - public void postModifyTable(ObserverContext ctx, - TableName tableName, HTableDescriptor htd) throws IOException { + public void preModifyTableProcedure( + final ObserverContext ctx, + final TableName tableName, + final HTableDescriptor htd) throws IOException { + } + + @Override + public void postModifyTableProcedure( + final ObserverContext ctx, + final TableName tableName, + final HTableDescriptor htd) throws IOException { } @Override @@ -228,9 +288,10 @@ public class BaseMasterObserver implements MasterObserver { } @Override - public void preAddColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void preAddColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Deprecated @@ -241,9 +302,10 @@ public class BaseMasterObserver implements MasterObserver { } @Override - public void postAddColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void postAddColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Deprecated @@ -276,9 +338,10 @@ public class BaseMasterObserver implements MasterObserver { } @Override - public void preModifyColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void preModifyColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Deprecated @@ -289,9 +352,10 @@ public class BaseMasterObserver implements MasterObserver { } @Override - public void postModifyColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void postModifyColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { } @Deprecated @@ -324,9 +388,10 @@ public class BaseMasterObserver implements MasterObserver { } @Override - public void preDeleteColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - byte[] columnFamily) throws IOException { + public void preDeleteColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final byte[] columnFamily) throws IOException { } @Deprecated @@ -337,9 +402,10 @@ public class BaseMasterObserver implements MasterObserver { } @Override - public void postDeleteColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - byte[] columnFamily) throws IOException { + public void postDeleteColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final byte[] columnFamily) throws IOException { } @@ -353,12 +419,14 @@ public class BaseMasterObserver implements MasterObserver { TableName tableName) throws IOException { } + @Deprecated @Override public void preEnableTableHandler( ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postEnableTableHandler( ObserverContext ctx, TableName tableName) @@ -366,6 +434,18 @@ public class BaseMasterObserver implements MasterObserver { } @Override + public void preEnableTableProcedure( + ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override + public void postEnableTableProcedure( + ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override public void preDisableTable(ObserverContext ctx, TableName tableName) throws IOException { } @@ -375,12 +455,14 @@ public class BaseMasterObserver implements MasterObserver { TableName tableName) throws IOException { } + @Deprecated @Override public void preDisableTableHandler( ObserverContext ctx, TableName tableName) throws IOException { } + @Deprecated @Override public void postDisableTableHandler( ObserverContext ctx, TableName tableName) @@ -388,6 +470,18 @@ public class BaseMasterObserver implements MasterObserver { } @Override + public void preDisableTableProcedure( + ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override + public void postDisableTableProcedure( + ObserverContext ctx, final TableName tableName) + throws IOException { + } + + @Override public void preAbortProcedure( ObserverContext ctx, final ProcedureExecutor procEnv, diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java index 81f97aa..0998c19 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java @@ -83,7 +83,11 @@ public interface MasterObserver extends Coprocessor { * @param desc the HTableDescriptor for the table * @param regions the initial regions created for the table * @throws IOException + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #preCreateTableProcedure(ObserverContext, HTableDescriptor, HRegionInfo[])}. */ + @Deprecated void preCreateTableHandler(final ObserverContext ctx, HTableDescriptor desc, HRegionInfo[] regions) throws IOException; @@ -95,11 +99,54 @@ public interface MasterObserver extends Coprocessor { * @param desc the HTableDescriptor for the table * @param regions the initial regions created for the table * @throws IOException + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #postCreateTableProcedure(ObserverContext, HTableDescriptor, HRegionInfo[])}. */ + @Deprecated void postCreateTableHandler(final ObserverContext ctx, HTableDescriptor desc, HRegionInfo[] regions) throws IOException; /** + * Called before a new table is created by + * {@link org.apache.hadoop.hbase.master.HMaster}. Called as part of create + * table procedure and it is async to the create RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #preCreateTableHandler(ObserverContext, HTableDescriptor, HRegionInfo[])} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param desc the HTableDescriptor for the table + * @param regions the initial regions created for the table + * @throws IOException + */ + void preCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException; + + /** + * Called after the createTable operation has been requested. Called as part + * of create table RPC call. Called as part of create table procedure and + * it is async to the create RPC call. + * + * Implementation note: This replaces the deprecated + * {@link #postCreateTableHandler(ObserverContext, HTableDescriptor, HRegionInfo[])} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param desc the HTableDescriptor for the table + * @param regions the initial regions created for the table + * @throws IOException + */ + void postCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException; + + /** * Called before {@link org.apache.hadoop.hbase.master.HMaster} deletes a * table. Called as part of delete table RPC call. * It can't bypass the default action, e.g., ctx.bypass() won't have effect. @@ -125,7 +172,11 @@ public interface MasterObserver extends Coprocessor { * It can't bypass the default action, e.g., ctx.bypass() won't have effect. * @param ctx the environment to interact with the framework and master * @param tableName the name of the table + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #preDeleteTableProcedure(ObserverContext, TableName)}. */ + @Deprecated void preDeleteTableHandler( final ObserverContext ctx, TableName tableName) throws IOException; @@ -137,11 +188,48 @@ public interface MasterObserver extends Coprocessor { * It can't bypass the default action, e.g., ctx.bypass() won't have effect. * @param ctx the environment to interact with the framework and master * @param tableName the name of the table + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #postDeleteTableProcedure(ObserverContext, TableName)}. */ + @Deprecated void postDeleteTableHandler( final ObserverContext ctx, TableName tableName) throws IOException; + /** + * Called before {@link org.apache.hadoop.hbase.master.HMaster} deletes a + * table. Called as part of delete table procedure and + * it is async to the delete RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #preDeleteTableHandler(ObserverContext, TableName)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + */ + void preDeleteTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException; + + /** + * Called after {@link org.apache.hadoop.hbase.master.HMaster} deletes a + * table. Called as part of delete table procedure and it is async to the + * delete RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #postDeleteTableHandler(ObserverContext, TableName)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + */ + void postDeleteTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException; /** * Called before {@link org.apache.hadoop.hbase.master.HMaster} truncates a @@ -171,7 +259,11 @@ public interface MasterObserver extends Coprocessor { * It can't bypass the default action, e.g., ctx.bypass() won't have effect. * @param ctx the environment to interact with the framework and master * @param tableName the name of the table + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #preTruncateTableProcedure(ObserverContext, TableName)}. */ + @Deprecated void preTruncateTableHandler( final ObserverContext ctx, TableName tableName) throws IOException; @@ -183,12 +275,50 @@ public interface MasterObserver extends Coprocessor { * It can't bypass the default action, e.g., ctx.bypass() won't have effect. * @param ctx the environment to interact with the framework and master * @param tableName the name of the table + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #postTruncateTableProcedure(ObserverContext, TableName)}. */ + @Deprecated void postTruncateTableHandler( final ObserverContext ctx, TableName tableName) throws IOException; /** + * Called before {@link org.apache.hadoop.hbase.master.HMaster} truncates a + * table. Called as part of truncate table procedure and it is async + * to the truncate RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #preTruncateTableHandler(ObserverContext, TableName)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + */ + void preTruncateTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException; + + /** + * Called after {@link org.apache.hadoop.hbase.master.HMaster} truncates a + * table. Called as part of truncate table procedure and it is async to the + * truncate RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #postTruncateTableHandler(ObserverContext, TableName)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + */ + void postTruncateTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException; + + /** * Called prior to modifying a table's properties. Called as part of modify * table RPC call. * It can't bypass the default action, e.g., ctx.bypass() won't have effect. @@ -216,7 +346,11 @@ public interface MasterObserver extends Coprocessor { * @param ctx the environment to interact with the framework and master * @param tableName the name of the table * @param htd the HTableDescriptor + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #preModifyTableProcedure(ObserverContext, TableName, HTableDescriptor)}. */ + @Deprecated void preModifyTableHandler( final ObserverContext ctx, final TableName tableName, HTableDescriptor htd) throws IOException; @@ -228,12 +362,52 @@ public interface MasterObserver extends Coprocessor { * @param ctx the environment to interact with the framework and master * @param tableName the name of the table * @param htd the HTableDescriptor + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-13645). + * Use {@link #postModifyTableProcedure(ObserverContext, TableName, HTableDescriptor)}. */ + @Deprecated void postModifyTableHandler( final ObserverContext ctx, final TableName tableName, HTableDescriptor htd) throws IOException; /** + * Called prior to modifying a table's properties. Called as part of modify + * table procedure and it is async to the modify table RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #preModifyTableHandler(ObserverContext, TableName, HTableDescriptor)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + * @param htd the HTableDescriptor + */ + void preModifyTableProcedure( + final ObserverContext ctx, + final TableName tableName, + final HTableDescriptor htd) throws IOException; + + /** + * Called after to modifying a table's properties. Called as part of modify + * table procedure and it is async to the modify table RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #postModifyTableHandler(ObserverContext, TableName, HTableDescriptor)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + * @param htd the HTableDescriptor + */ + void postModifyTableProcedure( + final ObserverContext ctx, + final TableName tableName, + final HTableDescriptor htd) throws IOException; + + /** * Called prior to adding a new column family to the table. Called as part of * add column RPC call. * @param ctx the environment to interact with the framework and master @@ -298,8 +472,8 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the HColumnDescriptor * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 - * (HBASE-13645). Use - * {@link #preAddColumnFamilyHandler(ObserverContext, TableName, HColumnDescriptor)}. + * (HBASE-13645). Use + * {@link #preAddColumnFamilyProcedure(ObserverContext, TableName, HColumnDescriptor)}. */ @Deprecated void preAddColumnHandler( @@ -308,7 +482,7 @@ public interface MasterObserver extends Coprocessor { /** * Called prior to adding a new column family to the table. Called as part of - * add column handler. + * add column procedure. * * Implementation note: This replaces the deprecated * {@link #preAddColumnHandler(ObserverContext, TableName, HColumnDescriptor)} method. @@ -318,9 +492,10 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the HColumnDescriptor */ - void preAddColumnFamilyHandler( + void preAddColumnFamilyProcedure( final ObserverContext ctx, - TableName tableName, HColumnDescriptor columnFamily) throws IOException; + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException; /** @@ -330,8 +505,8 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the HColumnDescriptor * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 - * (HBASE-13645). Use - * {@link #postAddColumnFamilyHandler(ObserverContext, TableName, HColumnDescriptor)}. + * (HBASE-13645). Use + * {@link #postAddColumnFamilyProcedure(ObserverContext, TableName, HColumnDescriptor)}. */ @Deprecated void postAddColumnHandler( @@ -340,7 +515,7 @@ public interface MasterObserver extends Coprocessor { /** * Called after the new column family has been created. Called as part of - * add column handler. + * add column procedure. * * Implementation note: This replaces the deprecated * {@link #postAddColumnHandler(ObserverContext, TableName, HColumnDescriptor)} method. @@ -350,9 +525,10 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the HColumnDescriptor */ - void postAddColumnFamilyHandler( + void postAddColumnFamilyProcedure( final ObserverContext ctx, - TableName tableName, HColumnDescriptor columnFamily) throws IOException; + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException; /** * Called prior to modifying a column family's attributes. Called as part of @@ -419,8 +595,8 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the HColumnDescriptor * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 - * (HBASE-13645). - * Use {@link #preModifyColumnFamilyHandler(ObserverContext, TableName, HColumnDescriptor)}. + * (HBASE-13645). + * Use {@link #preModifyColumnFamilyProcedure(ObserverContext, TableName, HColumnDescriptor)}. */ @Deprecated void preModifyColumnHandler( @@ -429,7 +605,7 @@ public interface MasterObserver extends Coprocessor { /** * Called prior to modifying a column family's attributes. Called as part of - * modify column handler. + * modify column procedure. * * Implementation note: This replaces the deprecated * {@link #preModifyColumnHandler(ObserverContext, TableName, HColumnDescriptor)} method. @@ -439,9 +615,10 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the HColumnDescriptor */ - void preModifyColumnFamilyHandler( + void preModifyColumnFamilyProcedure( final ObserverContext ctx, - TableName tableName, HColumnDescriptor columnFamily) throws IOException; + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException; /** * Called after the column family has been updated. Called as part of modify @@ -450,8 +627,8 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the HColumnDescriptor * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 - * (HBASE-13645). - * Use {@link #postModifyColumnFamilyHandler(ObserverContext, TableName, HColumnDescriptor)}. + * (HBASE-13645). + * Use {@link #postModifyColumnFamilyProcedure(ObserverContext, TableName, HColumnDescriptor)}. */ @Deprecated void postModifyColumnHandler( @@ -460,7 +637,7 @@ public interface MasterObserver extends Coprocessor { /** * Called after the column family has been updated. Called as part of modify - * column handler. + * column procedure. * * Implementation note: This replaces the deprecated * {@link #postModifyColumnHandler(ObserverContext, TableName, HColumnDescriptor)} method. @@ -470,9 +647,10 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the HColumnDescriptor */ - void postModifyColumnFamilyHandler( + void postModifyColumnFamilyProcedure( final ObserverContext ctx, - TableName tableName, HColumnDescriptor columnFamily) throws IOException; + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException; /** * Called prior to deleting the entire column family. Called as part of @@ -540,7 +718,7 @@ public interface MasterObserver extends Coprocessor { * @param columnFamily the column family * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 * (HBASE-13645). - * Use {@link #preDeleteColumnFamilyHandler(ObserverContext, TableName, byte[])}. + * Use {@link #preDeleteColumnFamilyProcedure(ObserverContext, TableName, byte[])}. */ @Deprecated void preDeleteColumnHandler( @@ -549,7 +727,7 @@ public interface MasterObserver extends Coprocessor { /** * Called prior to deleting the entire column family. Called as part of - * delete column handler. + * delete column procedure. * * Implementation note: This replaces the deprecated * {@link #preDeleteColumnHandler(ObserverContext, TableName, byte[])} method. @@ -559,7 +737,7 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the column family */ - void preDeleteColumnFamilyHandler( + void preDeleteColumnFamilyProcedure( final ObserverContext ctx, final TableName tableName, final byte[] columnFamily) throws IOException; @@ -571,7 +749,7 @@ public interface MasterObserver extends Coprocessor { * @param columnFamily the column family * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 * (HBASE-13645). - * Use {@link #postDeleteColumnFamilyHandler(ObserverContext, TableName, byte[])}. + * Use {@link #postDeleteColumnFamilyProcedure(ObserverContext, TableName, byte[])}. */ @Deprecated void postDeleteColumnHandler( @@ -580,7 +758,7 @@ public interface MasterObserver extends Coprocessor { /** * Called after the column family has been deleted. Called as part of - * delete column handler. + * delete column procedure. * * Implementation note: This replaces the deprecated * {@link #postDeleteColumnHandler(ObserverContext, TableName, byte[])} method. @@ -590,7 +768,7 @@ public interface MasterObserver extends Coprocessor { * @param tableName the name of the table * @param columnFamily the column family */ - void postDeleteColumnFamilyHandler( + void postDeleteColumnFamilyProcedure( final ObserverContext ctx, final TableName tableName, final byte[] columnFamily) throws IOException; @@ -618,7 +796,11 @@ public interface MasterObserver extends Coprocessor { * It can't bypass the default action, e.g., ctx.bypass() won't have effect. * @param ctx the environment to interact with the framework and master * @param tableName the name of the table + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #preEnableTableProcedure(ObserverContext, TableName)}. */ + @Deprecated void preEnableTableHandler( final ObserverContext ctx, final TableName tableName) throws IOException; @@ -628,12 +810,47 @@ public interface MasterObserver extends Coprocessor { * of enable table handler and it is async to the enable table RPC call. * @param ctx the environment to interact with the framework and master * @param tableName the name of the table + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #postEnableTableProcedure(ObserverContext, TableName)}. */ + @Deprecated void postEnableTableHandler( final ObserverContext ctx, final TableName tableName) throws IOException; /** + * Called prior to enabling a table. Called as part of enable table procedure + * and it is async to the enable table RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #preEnableTableHandler(ObserverContext, TableName)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + */ + void preEnableTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException; + + /** + * Called after the enableTable operation has been requested. Called as part + * of enable table procedure and it is async to the enable table RPC call. + * + * Implementation note: This replaces the deprecated + * {@link #postEnableTableHandler(ObserverContext, TableName)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + */ + void postEnableTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException; + + /** * Called prior to disabling a table. Called as part of disable table RPC * call. * It can't bypass the default action, e.g., ctx.bypass() won't have effect. @@ -658,7 +875,11 @@ public interface MasterObserver extends Coprocessor { * It can't bypass the default action, e.g., ctx.bypass() won't have effect. * @param ctx the environment to interact with the framework and master * @param tableName the name of the table + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #preDisableTableProcedure(ObserverContext, TableName)}. */ + @Deprecated void preDisableTableHandler( final ObserverContext ctx, final TableName tableName) throws IOException; @@ -668,12 +889,47 @@ public interface MasterObserver extends Coprocessor { * of disable table handler and it is asyn to the disable table RPC call. * @param ctx the environment to interact with the framework and master * @param tableName the name of the table + * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0 + * (HBASE-15575). + * Use {@link #postDisableTableProcedure(ObserverContext, TableName)}. */ + @Deprecated void postDisableTableHandler( final ObserverContext ctx, final TableName tableName) throws IOException; /** + * Called prior to disabling a table. Called as part of disable table procedure + * and it is asyn to the disable table RPC call. + * It can't bypass the default action, e.g., ctx.bypass() won't have effect. + * + * Implementation note: This replaces the deprecated + * {@link #preDisableTableHandler(ObserverContext, TableName)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + */ + void preDisableTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException; + + /** + * Called after the disableTable operation has been requested. Called as part + * of disable table procedure and it is asyn to the disable table RPC call. + * + * Implementation note: This replaces the deprecated + * {@link #postDisableTableHandler(ObserverContext, TableName)} method. + * Make sure to implement only one of the two as both are called. + * + * @param ctx the environment to interact with the framework and master + * @param tableName the name of the table + */ + void postDisableTableProcedure( + final ObserverContext ctx, + final TableName tableName) throws IOException; + + /** * Called before a abortProcedure request has been processed. * @param ctx the environment to interact with the framework and master * @throws IOException diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 3b5af42..8cc852f 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -1074,7 +1074,7 @@ public class HMaster extends HRegionServer implements MasterServices { // at a time. To do concurrency, would need fencing of enable/disable of // tables. // Any time changing this maxThreads to > 1, pls see the comment at - // AccessController#postCreateTableHandler + // AccessController#postCreateTableProcedure this.service.startExecutorService(ExecutorType.MASTER_TABLE_OPERATIONS, 1); startProcedureExecutor(); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java index 313b1ad..490c2ba 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java @@ -240,24 +240,26 @@ public class MasterCoprocessorHost }); } - public void preCreateTableHandler(final HTableDescriptor htd, final HRegionInfo[] regions) + public void preCreateTableProcedure(final HTableDescriptor htd, final HRegionInfo[] regions) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preCreateTableHandler(ctx, htd, regions); + oserver.preCreateTableProcedure(ctx, htd, regions); } }); } - public void postCreateTableHandler(final HTableDescriptor htd, final HRegionInfo[] regions) + public void postCreateTableProcedure(final HTableDescriptor htd, final HRegionInfo[] regions) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postCreateTableHandler(ctx, htd, regions); + oserver.postCreateTableProcedure(ctx, htd, regions); } }); } @@ -282,22 +284,24 @@ public class MasterCoprocessorHost }); } - public void preDeleteTableHandler(final TableName tableName) throws IOException { + public void preDeleteTableProcedure(final TableName tableName) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preDeleteTableHandler(ctx, tableName); + oserver.preDeleteTableProcedure(ctx, tableName); } }); } - public void postDeleteTableHandler(final TableName tableName) throws IOException { + public void postDeleteTableProcedure(final TableName tableName) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postDeleteTableHandler(ctx, tableName); + oserver.postDeleteTableProcedure(ctx, tableName); } }); } @@ -322,22 +326,24 @@ public class MasterCoprocessorHost }); } - public void preTruncateTableHandler(final TableName tableName) throws IOException { + public void preTruncateTableProcedure(final TableName tableName) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preTruncateTableHandler(ctx, tableName); + oserver.preTruncateTableProcedure(ctx, tableName); } }); } - public void postTruncateTableHandler(final TableName tableName) throws IOException { + public void postTruncateTableProcedure(final TableName tableName) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postTruncateTableHandler(ctx, tableName); + oserver.postTruncateTableProcedure(ctx, tableName); } }); } @@ -364,24 +370,26 @@ public class MasterCoprocessorHost }); } - public void preModifyTableHandler(final TableName tableName, final HTableDescriptor htd) + public void preModifyTableProcedure(final TableName tableName, final HTableDescriptor htd) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preModifyTableHandler(ctx, tableName, htd); + oserver.preModifyTableProcedure(ctx, tableName, htd); } }); } - public void postModifyTableHandler(final TableName tableName, final HTableDescriptor htd) + public void postModifyTableProcedure(final TableName tableName, final HTableDescriptor htd) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postModifyTableHandler(ctx, tableName, htd); + oserver.preModifyTableProcedure(ctx, tableName, htd); } }); } @@ -410,27 +418,30 @@ public class MasterCoprocessorHost }); } - public boolean preAddColumnHandler(final TableName tableName, - final HColumnDescriptor columnFamily) + public boolean preAddColumnFamilyProcedure( + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { return execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preAddColumnHandler(ctx, tableName, columnFamily); - oserver.preAddColumnFamilyHandler(ctx, tableName, columnFamily); + oserver.preAddColumnFamilyProcedure(ctx, tableName, columnFamily); } }); } - public void postAddColumnHandler(final TableName tableName, final HColumnDescriptor columnFamily) + public void postAddColumnFamilyProcedure( + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postAddColumnHandler(ctx, tableName, columnFamily); - oserver.postAddColumnFamilyHandler(ctx, tableName, columnFamily); + oserver.postAddColumnFamilyProcedure(ctx, tableName, columnFamily); } }); } @@ -459,26 +470,28 @@ public class MasterCoprocessorHost }); } - public boolean preModifyColumnHandler(final TableName tableName, + public boolean preModifyColumnFamilyProcedure( + final TableName tableName, final HColumnDescriptor columnFamily) throws IOException { return execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preModifyColumnHandler(ctx, tableName, columnFamily); - oserver.preModifyColumnFamilyHandler(ctx, tableName, columnFamily); + oserver.preModifyColumnFamilyProcedure(ctx, tableName, columnFamily); } }); } - public void postModifyColumnHandler(final TableName tableName, + public void postModifyColumnFamilyProcedure( + final TableName tableName, final HColumnDescriptor columnFamily) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postModifyColumnHandler(ctx, tableName, columnFamily); - oserver.postModifyColumnFamilyHandler(ctx, tableName, columnFamily); + oserver.postModifyColumnFamilyProcedure(ctx, tableName, columnFamily); } }); } @@ -507,26 +520,28 @@ public class MasterCoprocessorHost }); } - public boolean preDeleteColumnHandler(final TableName tableName, final byte[] columnFamily) + public boolean preDeleteColumnFamilyProcedure( + final TableName tableName, + final byte[] columnFamily) throws IOException { return execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preDeleteColumnHandler(ctx, tableName, columnFamily); - oserver.preDeleteColumnFamilyHandler(ctx, tableName, columnFamily); + oserver.preDeleteColumnFamilyProcedure(ctx, tableName, columnFamily); } }); } - public void postDeleteColumnHandler(final TableName tableName, final byte[] columnFamily) + public void postDeleteColumnFamilyProcedure(final TableName tableName, final byte[] columnFamily) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postDeleteColumnHandler(ctx, tableName, columnFamily); - oserver.postDeleteColumnFamilyHandler(ctx, tableName, columnFamily); + oserver.postDeleteColumnFamilyProcedure(ctx, tableName, columnFamily); } }); } @@ -551,22 +566,24 @@ public class MasterCoprocessorHost }); } - public void preEnableTableHandler(final TableName tableName) throws IOException { + public void preEnableTableProcedure(final TableName tableName) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preEnableTableHandler(ctx, tableName); + oserver.preEnableTableProcedure(ctx, tableName); } }); } - public void postEnableTableHandler(final TableName tableName) throws IOException { + public void postEnableTableProcedure(final TableName tableName) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postEnableTableHandler(ctx, tableName); + oserver.postEnableTableProcedure(ctx, tableName); } }); } @@ -591,22 +608,24 @@ public class MasterCoprocessorHost }); } - public void preDisableTableHandler(final TableName tableName) throws IOException { + public void preDisableTableProcedure(final TableName tableName) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.preDisableTableHandler(ctx, tableName); + oserver.preDisableTableProcedure(ctx, tableName); } }); } - public void postDisableTableHandler(final TableName tableName) throws IOException { + public void postDisableTableProcedure(final TableName tableName) throws IOException { execOperation(coprocessors.isEmpty() ? null : new CoprocessorOperation() { @Override public void call(MasterObserver oserver, ObserverContext ctx) throws IOException { oserver.postDisableTableHandler(ctx, tableName); + oserver.postDisableTableProcedure(ctx, tableName); } }); } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java index d34f25e..7e13d38 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java @@ -126,11 +126,11 @@ public class DisableTableHandler extends EventHandler { MasterCoprocessorHost cpHost = ((HMaster) this.server) .getMasterCoprocessorHost(); if (cpHost != null) { - cpHost.preDisableTableHandler(this.tableName); + cpHost.preDisableTableProcedure(this.tableName); } handleDisableTable(); if (cpHost != null) { - cpHost.postDisableTableHandler(this.tableName); + cpHost.postDisableTableProcedure(this.tableName); } } catch (IOException e) { LOG.error("Error trying to disable table " + this.tableName, e); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java index fd3d4c7..e547698 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java @@ -135,11 +135,11 @@ public class EnableTableHandler extends EventHandler { MasterCoprocessorHost cpHost = ((HMaster) this.server) .getMasterCoprocessorHost(); if (cpHost != null) { - cpHost.preEnableTableHandler(this.tableName); + cpHost.preEnableTableProcedure(this.tableName); } handleEnableTable(); if (cpHost != null) { - cpHost.postEnableTableHandler(this.tableName); + cpHost.postEnableTableProcedure(this.tableName); } } catch (IOException | InterruptedException e) { LOG.error("Error trying to enable the table " + this.tableName, e); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java index a58355b..661f7aa 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.java @@ -382,10 +382,10 @@ public class AddColumnFamilyProcedure public Void run() throws Exception { switch (state) { case ADD_COLUMN_FAMILY_PRE_OPERATION: - cpHost.preAddColumnHandler(tableName, cfDescriptor); + cpHost.preAddColumnFamilyProcedure(tableName, cfDescriptor); break; case ADD_COLUMN_FAMILY_POST_OPERATION: - cpHost.postAddColumnHandler(tableName, cfDescriptor); + cpHost.postAddColumnFamilyProcedure(tableName, cfDescriptor); break; default: throw new UnsupportedOperationException(this + " unhandled state=" + state); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java index 9477177..5f11df8 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.java @@ -375,7 +375,7 @@ public class CloneSnapshotProcedure user.doAs(new PrivilegedExceptionAction() { @Override public Void run() throws Exception { - cpHost.preCreateTableHandler(hTableDescriptor, null); + cpHost.preCreateTableProcedure(hTableDescriptor, null); return null; } }); @@ -397,7 +397,7 @@ public class CloneSnapshotProcedure user.doAs(new PrivilegedExceptionAction() { @Override public Void run() throws Exception { - cpHost.postCreateTableHandler(hTableDescriptor, regions); + cpHost.postCreateTableProcedure(hTableDescriptor, regions); return null; } }); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java index f262edb..ef21ab3 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java @@ -310,7 +310,7 @@ public class CreateTableProcedure user.doAs(new PrivilegedExceptionAction() { @Override public Void run() throws Exception { - cpHost.preCreateTableHandler(hTableDescriptor, regions); + cpHost.preCreateTableProcedure(hTableDescriptor, regions); return null; } }); @@ -326,7 +326,7 @@ public class CreateTableProcedure user.doAs(new PrivilegedExceptionAction() { @Override public Void run() throws Exception { - cpHost.postCreateTableHandler(hTableDescriptor, regions); + cpHost.postCreateTableProcedure(hTableDescriptor, regions); return null; } }); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java index 2e36f17..4065b86 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteColumnFamilyProcedure.java @@ -407,10 +407,10 @@ public class DeleteColumnFamilyProcedure public Void run() throws Exception { switch (state) { case DELETE_COLUMN_FAMILY_PRE_OPERATION: - cpHost.preDeleteColumnHandler(tableName, familyName); + cpHost.preDeleteColumnFamilyProcedure(tableName, familyName); break; case DELETE_COLUMN_FAMILY_POST_OPERATION: - cpHost.postDeleteColumnHandler(tableName, familyName); + cpHost.postDeleteColumnFamilyProcedure(tableName, familyName); break; default: throw new UnsupportedOperationException(this + " unhandled state=" + state); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java index ff22b88..e818d32 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java @@ -269,7 +269,7 @@ public class DeleteTableProcedure user.doAs(new PrivilegedExceptionAction() { @Override public Void run() throws Exception { - cpHost.preDeleteTableHandler(tableName); + cpHost.preDeleteTableProcedure(tableName); return null; } }); @@ -287,7 +287,7 @@ public class DeleteTableProcedure user.doAs(new PrivilegedExceptionAction() { @Override public Void run() throws Exception { - cpHost.postDeleteTableHandler(tableName); + cpHost.postDeleteTableProcedure(tableName); return null; } }); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java index 005069d..317f188 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.java @@ -464,10 +464,10 @@ public class DisableTableProcedure public Void run() throws Exception { switch (state) { case DISABLE_TABLE_PRE_OPERATION: - cpHost.preDisableTableHandler(tableName); + cpHost.preDisableTableProcedure(tableName); break; case DISABLE_TABLE_POST_OPERATION: - cpHost.postDisableTableHandler(tableName); + cpHost.postDisableTableProcedure(tableName); break; default: throw new UnsupportedOperationException(this + " unhandled state=" + state); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java index d8af419..acce597 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java @@ -566,10 +566,10 @@ public class EnableTableProcedure public Void run() throws Exception { switch (state) { case ENABLE_TABLE_PRE_OPERATION: - cpHost.preEnableTableHandler(getTableName()); + cpHost.preEnableTableProcedure(getTableName()); break; case ENABLE_TABLE_POST_OPERATION: - cpHost.postEnableTableHandler(getTableName()); + cpHost.postEnableTableProcedure(getTableName()); break; default: throw new UnsupportedOperationException(this + " unhandled state=" + state); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java index 28a5066..f3eb263 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyColumnFamilyProcedure.java @@ -363,10 +363,10 @@ public class ModifyColumnFamilyProcedure public Void run() throws Exception { switch (state) { case MODIFY_COLUMN_FAMILY_PRE_OPERATION: - cpHost.preModifyColumnHandler(tableName, cfDescriptor); + cpHost.preModifyColumnFamilyProcedure(tableName, cfDescriptor); break; case MODIFY_COLUMN_FAMILY_POST_OPERATION: - cpHost.postModifyColumnHandler(tableName, cfDescriptor); + cpHost.postModifyColumnFamilyProcedure(tableName, cfDescriptor); break; default: throw new UnsupportedOperationException(this + " unhandled state=" + state); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java index bd1451a..a0e7161 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java @@ -475,10 +475,10 @@ public class ModifyTableProcedure public Void run() throws Exception { switch (state) { case MODIFY_TABLE_PRE_OPERATION: - cpHost.preModifyTableHandler(getTableName(), modifiedHTableDescriptor); + cpHost.preModifyTableProcedure(getTableName(), modifiedHTableDescriptor); break; case MODIFY_TABLE_POST_OPERATION: - cpHost.postModifyTableHandler(getTableName(), modifiedHTableDescriptor); + cpHost.postModifyTableProcedure(getTableName(), modifiedHTableDescriptor); break; default: throw new UnsupportedOperationException(this + " unhandled state=" + state); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.java index a2ced47..6d3bd38 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.java @@ -264,7 +264,7 @@ public class TruncateTableProcedure user.doAs(new PrivilegedExceptionAction() { @Override public Void run() throws Exception { - cpHost.preTruncateTableHandler(tableName); + cpHost.preTruncateTableProcedure(tableName); return null; } }); @@ -280,7 +280,7 @@ public class TruncateTableProcedure user.doAs(new PrivilegedExceptionAction() { @Override public Void run() throws Exception { - cpHost.postTruncateTableHandler(tableName); + cpHost.postTruncateTableProcedure(tableName); return null; } }); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java index 3b36ada..5adf92f 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java @@ -1005,8 +1005,10 @@ public class AccessController extends BaseMasterAndRegionObserver } @Override - public void postCreateTableHandler(final ObserverContext c, - HTableDescriptor desc, HRegionInfo[] regions) throws IOException { + public void postCreateTableProcedure( + final ObserverContext c, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { // When AC is used, it should be configured as the 1st CP. // In Master, the table operations like create, are handled by a Thread pool but the max size // for this pool is 1. So if multiple CPs create tables on startup, these creations will happen diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java index 65fc0c3..8cf7222 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java @@ -151,24 +151,24 @@ public class TestMasterObserver { private boolean postRestoreSnapshotCalled; private boolean preDeleteSnapshotCalled; private boolean postDeleteSnapshotCalled; - private boolean preCreateTableHandlerCalled; - private boolean postCreateTableHandlerCalled; - private boolean preDeleteTableHandlerCalled; - private boolean postDeleteTableHandlerCalled; - private boolean preTruncateTableHandlerCalled; - private boolean postTruncateTableHandlerCalled; - private boolean preAddColumnHandlerCalled; - private boolean postAddColumnHandlerCalled; - private boolean preModifyColumnHandlerCalled; - private boolean postModifyColumnHandlerCalled; - private boolean preDeleteColumnHandlerCalled; - private boolean postDeleteColumnHandlerCalled; - private boolean preEnableTableHandlerCalled; - private boolean postEnableTableHandlerCalled; - private boolean preDisableTableHandlerCalled; - private boolean postDisableTableHandlerCalled; - private boolean preModifyTableHandlerCalled; - private boolean postModifyTableHandlerCalled; + private boolean preCreateTableProcedureCalled; + private boolean postCreateTableProcedureCalled; + private boolean preDeleteTableProcedureCalled; + private boolean postDeleteTableProcedureCalled; + private boolean preTruncateTableProcedureCalled; + private boolean postTruncateTableProcedureCalled; + private boolean preAddColumnFamilyProcedureCalled; + private boolean postAddColumnFamilyProcedureCalled; + private boolean preModifyColumnFamilyProcedureCalled; + private boolean postModifyColumnFamilyProcedureCalled; + private boolean preDeleteColumnFamilyProcedureCalled; + private boolean postDeleteColumnFamilyProcedureCalled; + private boolean preEnableTableProcedureCalled; + private boolean postEnableTableProcedureCalled; + private boolean preDisableTableProcedureCalled; + private boolean postDisableTableProcedureCalled; + private boolean preModifyTableProcedureCalled; + private boolean postModifyTableProcedureCalled; private boolean preGetTableDescriptorsCalled; private boolean postGetTableDescriptorsCalled; private boolean postGetTableNamesCalled; @@ -235,24 +235,24 @@ public class TestMasterObserver { postRestoreSnapshotCalled = false; preDeleteSnapshotCalled = false; postDeleteSnapshotCalled = false; - preCreateTableHandlerCalled = false; - postCreateTableHandlerCalled = false; - preDeleteTableHandlerCalled = false; - postDeleteTableHandlerCalled = false; - preTruncateTableHandlerCalled = false; - postTruncateTableHandlerCalled = false; - preModifyTableHandlerCalled = false; - postModifyTableHandlerCalled = false; - preAddColumnHandlerCalled = false; - postAddColumnHandlerCalled = false; - preModifyColumnHandlerCalled = false; - postModifyColumnHandlerCalled = false; - preDeleteColumnHandlerCalled = false; - postDeleteColumnHandlerCalled = false; - preEnableTableHandlerCalled = false; - postEnableTableHandlerCalled = false; - preDisableTableHandlerCalled = false; - postDisableTableHandlerCalled = false; + preCreateTableProcedureCalled = false; + postCreateTableProcedureCalled = false; + preDeleteTableProcedureCalled = false; + postDeleteTableProcedureCalled = false; + preTruncateTableProcedureCalled = false; + postTruncateTableProcedureCalled = false; + preModifyTableProcedureCalled = false; + postModifyTableProcedureCalled = false; + preAddColumnFamilyProcedureCalled = false; + postAddColumnFamilyProcedureCalled = false; + preModifyColumnFamilyProcedureCalled = false; + postModifyColumnFamilyProcedureCalled = false; + preDeleteColumnFamilyProcedureCalled = false; + postDeleteColumnFamilyProcedureCalled = false; + preEnableTableProcedureCalled = false; + postEnableTableProcedureCalled = false; + preDisableTableProcedureCalled = false; + postDisableTableProcedureCalled = false; preGetTableDescriptorsCalled = false; postGetTableDescriptorsCalled = false; postGetTableNamesCalled = false; @@ -961,109 +961,169 @@ public class TestMasterObserver { return preDeleteSnapshotCalled && postDeleteSnapshotCalled; } + @Deprecated @Override public void preCreateTableHandler( ObserverContext env, HTableDescriptor desc, HRegionInfo[] regions) throws IOException { + } + + @Override + public void preCreateTableProcedure( + final ObserverContext env, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { if (bypass) { env.bypass(); } - preCreateTableHandlerCalled = true; + preCreateTableProcedureCalled = true; } + @Deprecated @Override public void postCreateTableHandler( ObserverContext ctx, HTableDescriptor desc, HRegionInfo[] regions) throws IOException { - postCreateTableHandlerCalled = true; + } + + @Override + public void postCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { + postCreateTableProcedureCalled = true; tableCreationLatch.countDown(); } - public boolean wasPreCreateTableHandlerCalled(){ - return preCreateTableHandlerCalled; + public boolean wasPreCreateTableProcedureCalled(){ + return preCreateTableProcedureCalled; } - public boolean wasCreateTableHandlerCalled() { - return preCreateTableHandlerCalled && postCreateTableHandlerCalled; + public boolean wasCreateTableProcedureCalled() { + return preCreateTableProcedureCalled && postCreateTableProcedureCalled; } - public boolean wasCreateTableHandlerCalledOnly() { - return preCreateTableHandlerCalled && !postCreateTableHandlerCalled; + public boolean wasCreateTableProcedureCalledOnly() { + return preCreateTableProcedureCalled && !postCreateTableProcedureCalled; } + @Deprecated @Override public void preDeleteTableHandler( ObserverContext env, TableName tableName) throws IOException { + } + + @Deprecated + @Override + public void postDeleteTableHandler( + ObserverContext ctx, TableName tableName) + throws IOException { + } + + @Override + public void preDeleteTableProcedure( + final ObserverContext env, final TableName tableName) + throws IOException { if (bypass) { env.bypass(); } - preDeleteTableHandlerCalled = true; + preDeleteTableProcedureCalled = true; } @Override - public void postDeleteTableHandler( - ObserverContext ctx, TableName tableName) + public void postDeleteTableProcedure( + final ObserverContext ctx, final TableName tableName) throws IOException { - postDeleteTableHandlerCalled = true; + postDeleteTableProcedureCalled = true; tableDeletionLatch.countDown(); } - public boolean wasDeleteTableHandlerCalled() { - return preDeleteTableHandlerCalled && postDeleteTableHandlerCalled; + public boolean wasDeleteTableProcedureCalled() { + return preDeleteTableProcedureCalled && postDeleteTableProcedureCalled; } - public boolean wasDeleteTableHandlerCalledOnly() { - return preDeleteTableHandlerCalled && !postDeleteTableHandlerCalled; + public boolean wasDeleteTableProcedureCalledOnly() { + return preDeleteTableProcedureCalled && !postDeleteTableProcedureCalled; } + @Deprecated @Override public void preTruncateTableHandler( ObserverContext env, TableName tableName) throws IOException { + } + + @Deprecated + @Override + public void postTruncateTableHandler( + ObserverContext ctx, TableName tableName) + throws IOException { + } + + @Override + public void preTruncateTableProcedure( + final ObserverContext env, final TableName tableName) + throws IOException { if (bypass) { env.bypass(); } - preTruncateTableHandlerCalled = true; + preTruncateTableProcedureCalled = true; } @Override - public void postTruncateTableHandler( - ObserverContext ctx, TableName tableName) + public void postTruncateTableProcedure( + final ObserverContext ctx, final TableName tableName) throws IOException { - postTruncateTableHandlerCalled = true; + postTruncateTableProcedureCalled = true; } - public boolean wasTruncateTableHandlerCalled() { - return preTruncateTableHandlerCalled && postTruncateTableHandlerCalled; + public boolean wasTruncateTableProcedureCalled() { + return preTruncateTableProcedureCalled && postTruncateTableProcedureCalled; } - public boolean wasTruncateTableHandlerCalledOnly() { - return preTruncateTableHandlerCalled && !postTruncateTableHandlerCalled; + public boolean wasTruncateTableProcedureCalledOnly() { + return preTruncateTableProcedureCalled && !postTruncateTableProcedureCalled; } + @Deprecated @Override public void preModifyTableHandler( ObserverContext env, TableName tableName, HTableDescriptor htd) throws IOException { - if (bypass) { - env.bypass(); - } - preModifyTableHandlerCalled = true; } + @Deprecated @Override public void postModifyTableHandler( ObserverContext env, TableName tableName, HTableDescriptor htd) throws IOException { - postModifyTableHandlerCalled = true; } - public boolean wasModifyTableHandlerCalled() { - return preModifyColumnHandlerCalled && postModifyColumnHandlerCalled; + @Override + public void preModifyTableProcedure( + final ObserverContext env, + final TableName tableName, + final HTableDescriptor htd) throws IOException { + if (bypass) { + env.bypass(); + } + preModifyTableProcedureCalled = true; + } + + @Override + public void postModifyTableProcedure( + final ObserverContext env, + final TableName tableName, + final HTableDescriptor htd) throws IOException { + postModifyTableProcedureCalled = true; + } + + public boolean wasModifyTableProcedureCalled() { + return preModifyColumnFamilyProcedureCalled && postModifyColumnFamilyProcedureCalled; } - public boolean wasModifyTableHandlerCalledOnly() { - return preModifyColumnHandlerCalled && !postModifyColumnHandlerCalled; + public boolean wasModifyTableProcedureCalledOnly() { + return preModifyColumnFamilyProcedureCalled && !postModifyColumnFamilyProcedureCalled; } @Deprecated @@ -1074,13 +1134,14 @@ public class TestMasterObserver { } @Override - public void preAddColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void preAddColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { if (bypass) { ctx.bypass(); } - preAddColumnHandlerCalled = true; + preAddColumnFamilyProcedureCalled = true; } @Deprecated @@ -1091,18 +1152,19 @@ public class TestMasterObserver { } @Override - public void postAddColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { - postAddColumnHandlerCalled = true; + public void postAddColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { + postAddColumnFamilyProcedureCalled = true; } - public boolean wasAddColumnHandlerCalled() { - return preAddColumnHandlerCalled && postAddColumnHandlerCalled; + public boolean wasAddColumnFamilyProcedureCalled() { + return preAddColumnFamilyProcedureCalled && postAddColumnFamilyProcedureCalled; } - public boolean preAddColumnHandlerCalledOnly() { - return preAddColumnHandlerCalled && !postAddColumnHandlerCalled; + public boolean preAddColumnFamilyProcedureCalledOnly() { + return preAddColumnFamilyProcedureCalled && !postAddColumnFamilyProcedureCalled; } @Deprecated @@ -1113,13 +1175,14 @@ public class TestMasterObserver { } @Override - public void preModifyColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - HColumnDescriptor columnFamily) throws IOException { + public void preModifyColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final HColumnDescriptor columnFamily) throws IOException { if (bypass) { ctx.bypass(); } - preModifyColumnHandlerCalled = true; + preModifyColumnFamilyProcedureCalled = true; } @Deprecated @@ -1130,18 +1193,18 @@ public class TestMasterObserver { } @Override - public void postModifyColumnFamilyHandler( + public void postModifyColumnFamilyProcedure( ObserverContext ctx, TableName tableName, HColumnDescriptor columnFamily) throws IOException { - postModifyColumnHandlerCalled = true; + postModifyColumnFamilyProcedureCalled = true; } - public boolean wasModifyColumnHandlerCalled() { - return preModifyColumnHandlerCalled && postModifyColumnHandlerCalled; + public boolean wasModifyColumnFamilyProcedureCalled() { + return preModifyColumnFamilyProcedureCalled && postModifyColumnFamilyProcedureCalled; } - public boolean preModifyColumnHandlerCalledOnly() { - return preModifyColumnHandlerCalled && !postModifyColumnHandlerCalled; + public boolean preModifyColumnFamilyProcedureCalledOnly() { + return preModifyColumnFamilyProcedureCalled && !postModifyColumnFamilyProcedureCalled; } @Deprecated @@ -1152,13 +1215,14 @@ public class TestMasterObserver { } @Override - public void preDeleteColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - byte[] columnFamily) throws IOException { + public void preDeleteColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final byte[] columnFamily) throws IOException { if (bypass) { ctx.bypass(); } - preDeleteColumnHandlerCalled = true; + preDeleteColumnFamilyProcedureCalled = true; } @Deprecated @@ -1169,68 +1233,95 @@ public class TestMasterObserver { } @Override - public void postDeleteColumnFamilyHandler( - ObserverContext ctx, TableName tableName, - byte[] columnFamily) throws IOException { - postDeleteColumnHandlerCalled = true; + public void postDeleteColumnFamilyProcedure( + final ObserverContext ctx, + final TableName tableName, + final byte[] columnFamily) throws IOException { + postDeleteColumnFamilyProcedureCalled = true; } - public boolean wasDeleteColumnHandlerCalled() { - return preDeleteColumnHandlerCalled && postDeleteColumnHandlerCalled; + public boolean wasDeleteColumnFamilyProcedureCalled() { + return preDeleteColumnFamilyProcedureCalled && postDeleteColumnFamilyProcedureCalled; } - public boolean preDeleteColumnHandlerCalledOnly() { - return preDeleteColumnHandlerCalled && !postDeleteColumnHandlerCalled; + public boolean preDeleteColumnFamilyProcedureCalledOnly() { + return preDeleteColumnFamilyProcedureCalled && !postDeleteColumnFamilyProcedureCalled; } + @Deprecated @Override public void preEnableTableHandler( ObserverContext env, TableName tableName) throws IOException { - if (bypass) { - env.bypass(); - } - preEnableTableHandlerCalled = true; } + @Deprecated @Override public void postEnableTableHandler( ObserverContext ctx, TableName tableName) throws IOException { - postEnableTableHandlerCalled = true; } - public boolean wasEnableTableHandlerCalled() { - return preEnableTableHandlerCalled && postEnableTableHandlerCalled; + @Override + public void preEnableTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + if (bypass) { + ctx.bypass(); + } + preEnableTableProcedureCalled = true; + } + + @Override + public void postEnableTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + postEnableTableProcedureCalled = true; } - public boolean preEnableTableHandlerCalledOnly() { - return preEnableTableHandlerCalled && !postEnableTableHandlerCalled; + public boolean wasEnableTableProcedureCalled() { + return preEnableTableProcedureCalled && postEnableTableProcedureCalled; + } + + public boolean preEnableTableProcedureCalledOnly() { + return preEnableTableProcedureCalled && !postEnableTableProcedureCalled; } @Override public void preDisableTableHandler( ObserverContext env, TableName tableName) throws IOException { - if (bypass) { - env.bypass(); - } - preDisableTableHandlerCalled = true; } @Override public void postDisableTableHandler( ObserverContext ctx, TableName tableName) throws IOException { - postDisableTableHandlerCalled = true; } - public boolean wasDisableTableHandlerCalled() { - return preDisableTableHandlerCalled && postDisableTableHandlerCalled; + @Override + public void preDisableTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + if (bypass) { + ctx.bypass(); + } + preDisableTableProcedureCalled = true; + } + + @Override + public void postDisableTableProcedure( + final ObserverContext ctx, final TableName tableName) + throws IOException { + postDisableTableProcedureCalled = true; + } + + public boolean wasDisableTableProcedureCalled() { + return preDisableTableProcedureCalled && postDisableTableProcedureCalled; } - public boolean preDisableTableHandlerCalledOnly() { - return preDisableTableHandlerCalled && !postDisableTableHandlerCalled; + public boolean preDisableTableProcedureCalledOnly() { + return preDisableTableProcedureCalled && !postDisableTableProcedureCalled; } @Override @@ -1444,9 +1535,9 @@ public class TestMasterObserver { assertTrue("Test table should be created", cp.wasCreateTableCalled()); tableCreationLatch.await(); assertTrue("Table pre create handler called.", cp - .wasPreCreateTableHandlerCalled()); + .wasPreCreateTableProcedureCalled()); assertTrue("Table create handler should be called.", - cp.wasCreateTableHandlerCalled()); + cp.wasCreateTableProcedureCalled()); RegionLocator regionLocator = connection.getRegionLocator(htd.getTableName()); List regions = regionLocator.getAllRegionLocations(); @@ -1463,7 +1554,7 @@ public class TestMasterObserver { assertTrue("Coprocessor should have been called on table disable", cp.wasDisableTableCalled()); assertTrue("Disable table handler should be called.", - cp.wasDisableTableHandlerCalled()); + cp.wasDisableTableProcedureCalled()); // enable assertFalse(cp.wasEnableTableCalled()); @@ -1473,7 +1564,7 @@ public class TestMasterObserver { assertTrue("Coprocessor should have been called on table enable", cp.wasEnableTableCalled()); assertTrue("Enable table handler should be called.", - cp.wasEnableTableHandlerCalled()); + cp.wasEnableTableProcedureCalled()); admin.disableTable(tableName); assertTrue(admin.isTableDisabled(tableName)); @@ -1510,7 +1601,7 @@ public class TestMasterObserver { assertTrue("Coprocessor should have been called on table delete", cp.wasDeleteTableCalled()); assertTrue("Delete table handler should be called.", - cp.wasDeleteTableHandlerCalled()); + cp.wasDeleteTableProcedureCalled()); // turn off bypass, run the tests again cp.enableBypass(false); @@ -1520,19 +1611,19 @@ public class TestMasterObserver { assertTrue("Test table should be created", cp.wasCreateTableCalled()); tableCreationLatch.await(); assertTrue("Table pre create handler called.", cp - .wasPreCreateTableHandlerCalled()); + .wasPreCreateTableProcedureCalled()); assertTrue("Table create handler should be called.", - cp.wasCreateTableHandlerCalled()); + cp.wasCreateTableProcedureCalled()); // disable assertFalse(cp.wasDisableTableCalled()); - assertFalse(cp.wasDisableTableHandlerCalled()); + assertFalse(cp.wasDisableTableProcedureCalled()); admin.disableTable(tableName); assertTrue(admin.isTableDisabled(tableName)); assertTrue("Coprocessor should have been called on table disable", cp.wasDisableTableCalled()); assertTrue("Disable table handler should be called.", - cp.wasDisableTableHandlerCalled()); + cp.wasDisableTableProcedureCalled()); // modify table htd.setMaxFileSize(512 * 1024 * 1024); @@ -1544,7 +1635,7 @@ public class TestMasterObserver { assertTrue("New column family should have been added to test table", cp.wasAddColumnCalled()); assertTrue("Add column handler should be called.", - cp.wasAddColumnHandlerCalled()); + cp.wasAddColumnFamilyProcedureCalled()); // modify a column family HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAMILY2); @@ -1553,17 +1644,17 @@ public class TestMasterObserver { assertTrue("Second column family should be modified", cp.wasModifyColumnCalled()); assertTrue("Modify table handler should be called.", - cp.wasModifyColumnHandlerCalled()); + cp.wasModifyColumnFamilyProcedureCalled()); // enable assertFalse(cp.wasEnableTableCalled()); - assertFalse(cp.wasEnableTableHandlerCalled()); + assertFalse(cp.wasEnableTableProcedureCalled()); admin.enableTable(tableName); assertTrue(admin.isTableEnabled(tableName)); assertTrue("Coprocessor should have been called on table enable", cp.wasEnableTableCalled()); assertTrue("Enable table handler should be called.", - cp.wasEnableTableHandlerCalled()); + cp.wasEnableTableProcedureCalled()); // disable again admin.disableTable(tableName); @@ -1572,7 +1663,7 @@ public class TestMasterObserver { // delete column assertFalse("No column family deleted yet", cp.wasDeleteColumnCalled()); assertFalse("Delete table column handler should not be called.", - cp.wasDeleteColumnHandlerCalled()); + cp.wasDeleteColumnFamilyProcedureCalled()); admin.deleteColumnFamily(tableName, TEST_FAMILY2); HTableDescriptor tableDesc = admin.getTableDescriptor(tableName); assertNull("'"+Bytes.toString(TEST_FAMILY2)+"' should have been removed", @@ -1580,19 +1671,19 @@ public class TestMasterObserver { assertTrue("Coprocessor should have been called on column delete", cp.wasDeleteColumnCalled()); assertTrue("Delete table column handler should be called.", - cp.wasDeleteColumnHandlerCalled()); + cp.wasDeleteColumnFamilyProcedureCalled()); // delete table assertFalse("No table deleted yet", cp.wasDeleteTableCalled()); assertFalse("Delete table handler should not be called.", - cp.wasDeleteTableHandlerCalled()); + cp.wasDeleteTableProcedureCalled()); deleteTable(admin, tableName); assertFalse("Test table should have been deleted", admin.tableExists(tableName)); assertTrue("Coprocessor should have been called on table delete", cp.wasDeleteTableCalled()); assertTrue("Delete table handler should be called.", - cp.wasDeleteTableHandlerCalled()); + cp.wasDeleteTableProcedureCalled()); } } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java index 14e4844..83c200a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java @@ -104,18 +104,18 @@ public class TestTableLockManager { public static class TestLockTimeoutExceptionMasterObserver extends BaseMasterObserver { @Override - public void preDeleteColumnFamilyHandler(ObserverContext ctx, + public void preDeleteColumnFamilyProcedure(ObserverContext ctx, TableName tableName, byte[] columnFamily) throws IOException { deleteColumn.countDown(); } @Override - public void postDeleteColumnFamilyHandler(ObserverContext ctx, + public void postDeleteColumnFamilyProcedure(ObserverContext ctx, TableName tableName, byte[] columnFamily) throws IOException { Threads.sleep(10000); } @Override - public void preAddColumnFamilyHandler(ObserverContext ctx, + public void preAddColumnFamilyProcedure(ObserverContext ctx, TableName tableName, HColumnDescriptor columnFamily) throws IOException { fail("Add column should have timeouted out for acquiring the table lock"); } @@ -169,14 +169,14 @@ public class TestTableLockManager { public static class TestAlterAndDisableMasterObserver extends BaseMasterObserver { @Override - public void preAddColumnFamilyHandler(ObserverContext ctx, + public void preAddColumnFamilyProcedure(ObserverContext ctx, TableName tableName, HColumnDescriptor columnFamily) throws IOException { LOG.debug("addColumn called"); addColumn.countDown(); } @Override - public void postAddColumnFamilyHandler(ObserverContext ctx, + public void postAddColumnFamilyProcedure(ObserverContext ctx, TableName tableName, HColumnDescriptor columnFamily) throws IOException { Threads.sleep(6000); try { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java index 40732f6..021a6dc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java @@ -513,7 +513,7 @@ public class TestNamespaceAuditor { byte[] columnFamily = Bytes.toBytes("info"); HTableDescriptor tableDescOne = new HTableDescriptor(tableOne); tableDescOne.addFamily(new HColumnDescriptor(columnFamily)); - MasterSyncObserver.throwExceptionInPreCreateTableHandler = true; + MasterSyncObserver.throwExceptionInPreCreateTableProcedure = true; try { try { ADMIN.createTable(tableDescOne); @@ -527,7 +527,7 @@ public class TestNamespaceAuditor { assertEquals("First table creation failed in namespace so number of tables in namespace " + "should be 0.", 0, nstate.getTables().size()); - MasterSyncObserver.throwExceptionInPreCreateTableHandler = false; + MasterSyncObserver.throwExceptionInPreCreateTableProcedure = false; try { ADMIN.createTable(tableDescOne); } catch (Exception e) { @@ -539,7 +539,7 @@ public class TestNamespaceAuditor { assertEquals("First table was created successfully so table size in namespace should " + "be one now.", 1, nstate.getTables().size()); } finally { - MasterSyncObserver.throwExceptionInPreCreateTableHandler = false; + MasterSyncObserver.throwExceptionInPreCreateTableProcedure = false; if (ADMIN.tableExists(tableOne)) { ADMIN.disableTable(tableOne); deleteTable(tableOne); @@ -660,7 +660,7 @@ public class TestNamespaceAuditor { public static class MasterSyncObserver extends BaseMasterObserver { volatile CountDownLatch tableDeletionLatch; - static boolean throwExceptionInPreCreateTableHandler; + static boolean throwExceptionInPreCreateTableProcedure; @Override public void preDeleteTable(ObserverContext ctx, @@ -676,9 +676,9 @@ public class TestNamespaceAuditor { } @Override - public void preCreateTableHandler(ObserverContext ctx, + public void preCreateTableProcedure(ObserverContext ctx, HTableDescriptor desc, HRegionInfo[] regions) throws IOException { - if (throwExceptionInPreCreateTableHandler) { + if (throwExceptionInPreCreateTableProcedure) { throw new IOException("Throw exception as it is demanded."); } } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java index 22a9748..e0101f0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java @@ -628,10 +628,11 @@ public class SecureTestUtil { volatile CountDownLatch tableDeletionLatch = null; @Override - public void postCreateTableHandler( + public void postCreateTableProcedure( final ObserverContext ctx, HTableDescriptor desc, HRegionInfo[] regions) throws IOException { - // the AccessController test, some times calls only and directly the postCreateTableHandler() + // the AccessController test, some times calls only and directly the + // postCreateTableProcedure() if (tableCreationLatch != null) { tableCreationLatch.countDown(); } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/BaseTestHBaseFsck.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/BaseTestHBaseFsck.java index 35560f5..61c70c2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/BaseTestHBaseFsck.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/BaseTestHBaseFsck.java @@ -608,9 +608,12 @@ public class BaseTestHBaseFsck { volatile CountDownLatch tableDeletionLatch = null; @Override - public void postCreateTableHandler(final ObserverContext ctx, - HTableDescriptor desc, HRegionInfo[] regions) throws IOException { - // the AccessController test, some times calls only and directly the postCreateTableHandler() + public void postCreateTableProcedure( + final ObserverContext ctx, + final HTableDescriptor desc, + final HRegionInfo[] regions) throws IOException { + // the AccessController test, some times calls only and directly the + // postCreateTableProcedure() if (tableCreationLatch != null) { tableCreationLatch.countDown(); }