hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject hbase git commit: HBASE-17189 TestMasterObserver#wasModifyTableActionCalled uses wrong variables (Stephen Yuan Jiang)
Date Tue, 29 Nov 2016 07:09:53 GMT
Repository: hbase
Updated Branches:
  refs/heads/master b2d3fa1a8 -> d87df9209


HBASE-17189 TestMasterObserver#wasModifyTableActionCalled uses wrong variables (Stephen Yuan
Jiang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d87df920
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d87df920
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d87df920

Branch: refs/heads/master
Commit: d87df9209a5d0ec035b8f6ddbf437193dcbb8515
Parents: b2d3fa1
Author: Stephen Yuan Jiang <syuanjiangdev@gmail.com>
Authored: Mon Nov 28 23:09:42 2016 -0800
Committer: Stephen Yuan Jiang <syuanjiangdev@gmail.com>
Committed: Mon Nov 28 23:09:42 2016 -0800

----------------------------------------------------------------------
 .../hadoop/hbase/coprocessor/TestMasterObserver.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d87df920/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index c431beb..5497a3f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/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<MasterCoprocessorEnvironment> env)
         throws IOException {
       preStopMasterCalled = true;
     }
 
+    public boolean wasStopMasterCalled() {
+      return preStopMasterCalled;
+    }
+
     @Override
     public void preMasterInitialization(
         ObserverContext<MasterCoprocessorEnvironment> 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


Mime
View raw message