You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/04/27 02:28:44 UTC

hbase git commit: HBASE-15717 TestClassLoading#testMasterCoprocessorsReported fails due to Master Coprocessors mismatch

Repository: hbase
Updated Branches:
  refs/heads/HBASE-7912 1a3367354 -> 8b964727d


HBASE-15717 TestClassLoading#testMasterCoprocessorsReported fails due to Master Coprocessors mismatch


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

Branch: refs/heads/HBASE-7912
Commit: 8b964727dff0f019df82e0a4828e2de18023f5d3
Parents: 1a33673
Author: tedyu <yu...@gmail.com>
Authored: Tue Apr 26 17:28:38 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Tue Apr 26 17:28:38 2016 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/coprocessor/TestClassLoading.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/8b964727/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
index f5d2a20..762ee36 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.hbase.backup.master.BackupController;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.regionserver.Region;
 import org.apache.hadoop.hbase.regionserver.TestServerCustomProtocol;
@@ -69,6 +70,7 @@ public class TestClassLoading {
   private static Class<?> regionCoprocessor2 = TestServerCustomProtocol.PingHandler.class;
   private static Class<?> regionServerCoprocessor = SampleRegionWALObserver.class;
   private static Class<?> masterCoprocessor = BaseMasterObserver.class;
+  private static Class<?> backupCoprocessor = BackupController.class;
 
   private static final String[] regionServerSystemCoprocessors =
       new String[]{
@@ -532,7 +534,7 @@ public class TestClassLoading {
     // to master: verify that the master is reporting the correct set of
     // loaded coprocessors.
     final String loadedMasterCoprocessorsVerify =
-        "[" + masterCoprocessor.getSimpleName() + "]";
+        "[" + backupCoprocessor.getSimpleName() + ", " + masterCoprocessor.getSimpleName() + "]";
     String loadedMasterCoprocessors =
         java.util.Arrays.toString(
             TEST_UTIL.getHBaseCluster().getMaster().getMasterCoprocessors());