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 c431beb..5497a3f 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 @@ -225,6 +225,8 @@ public class TestMasterObserver { postBalanceCalled = false; preBalanceSwitchCalled = false; postBalanceSwitchCalled = false; + preShutdownCalled = false; + preStopMasterCalled = false; preSnapshotCalled = false; postSnapshotCalled = false; preListSnapshotCalled = false; @@ -835,12 +837,20 @@ public class TestMasterObserver { preShutdownCalled = true; } + public boolean wasShutdownCalled() { + return preShutdownCalled; + } + @Override public void preStopMaster(ObserverContext env) throws IOException { preStopMasterCalled = true; } + public boolean wasStopMasterCalled() { + return preStopMasterCalled; + } + @Override public void preMasterInitialization( ObserverContext ctx) throws IOException { @@ -1119,11 +1129,11 @@ public class TestMasterObserver { } public boolean wasModifyTableActionCalled() { - return preModifyColumnFamilyActionCalled && postCompletedModifyColumnFamilyActionCalled; + return preModifyTableActionCalled && postCompletedModifyTableActionCalled; } public boolean wasModifyTableActionCalledOnly() { - return preModifyColumnFamilyActionCalled && !postCompletedModifyColumnFamilyActionCalled; + return preModifyTableActionCalled && !postCompletedModifyTableActionCalled; } @Deprecated