You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/11/04 06:30:57 UTC

[1/4] hbase git commit: HBASE-19173 Configure IntegrationTestRSGroup automatically for minicluster mode

Repository: hbase
Updated Branches:
  refs/heads/branch-1 1e227acd6 -> 51b65707b
  refs/heads/branch-1.4 28c7315e0 -> 4d7c40af9
  refs/heads/branch-2 3a8e3704c -> 65f620a85
  refs/heads/master 888e584a3 -> ac6b998af


HBASE-19173 Configure IntegrationTestRSGroup automatically for minicluster mode


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

Branch: refs/heads/branch-1
Commit: 51b65707b35a444b68a2375e69162b50969deb1c
Parents: 1e227ac
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Nov 3 17:38:32 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Nov 3 23:27:52 2017 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/51b65707/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java b/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
index e5bb995..622811c 100644
--- a/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
+++ b/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
@@ -21,8 +21,10 @@ package org.apache.hadoop.hbase.rsgroup;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
 import org.apache.hadoop.hbase.Waiter;
+import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.testclassification.IntegrationTests;
 import org.junit.After;
 import org.junit.Before;
@@ -45,6 +47,10 @@ public class IntegrationTestRSGroup extends TestRSGroupsBase {
       LOG.info("Setting up IntegrationTestGroup");
       LOG.info("Initializing cluster with " + NUM_SLAVES_BASE + " servers");
       TEST_UTIL = new IntegrationTestingUtility();
+      TEST_UTIL.getConfiguration().set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS,
+        RSGroupBasedLoadBalancer.class.getName());
+      TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
+        RSGroupAdminEndpoint.class.getName());
       ((IntegrationTestingUtility)TEST_UTIL).initializeCluster(NUM_SLAVES_BASE);
       //set shared configs
       admin = TEST_UTIL.getHBaseAdmin();

[2/4] hbase git commit: HBASE-19173 Configure IntegrationTestRSGroup automatically for minicluster mode

Posted by ap...@apache.org.
HBASE-19173 Configure IntegrationTestRSGroup automatically for minicluster mode


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

Branch: refs/heads/branch-1.4
Commit: 4d7c40af9b7fb8945b0ce582e8d5b322e7d91fc5
Parents: 28c7315
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Nov 3 17:38:32 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Nov 3 23:27:56 2017 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/4d7c40af/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java b/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
index e5bb995..622811c 100644
--- a/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
+++ b/hbase-it/src/test/rsgroup/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
@@ -21,8 +21,10 @@ package org.apache.hadoop.hbase.rsgroup;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
 import org.apache.hadoop.hbase.Waiter;
+import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.testclassification.IntegrationTests;
 import org.junit.After;
 import org.junit.Before;
@@ -45,6 +47,10 @@ public class IntegrationTestRSGroup extends TestRSGroupsBase {
       LOG.info("Setting up IntegrationTestGroup");
       LOG.info("Initializing cluster with " + NUM_SLAVES_BASE + " servers");
       TEST_UTIL = new IntegrationTestingUtility();
+      TEST_UTIL.getConfiguration().set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS,
+        RSGroupBasedLoadBalancer.class.getName());
+      TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
+        RSGroupAdminEndpoint.class.getName());
       ((IntegrationTestingUtility)TEST_UTIL).initializeCluster(NUM_SLAVES_BASE);
       //set shared configs
       admin = TEST_UTIL.getHBaseAdmin();

[3/4] hbase git commit: HBASE-19173 Configure IntegrationTestRSGroup automatically for minicluster mode

Posted by ap...@apache.org.
HBASE-19173 Configure IntegrationTestRSGroup automatically for minicluster mode


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

Branch: refs/heads/master
Commit: ac6b998afe033cbb6a307d249c8e18bb97d54c9f
Parents: 888e584
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Nov 3 17:38:32 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Nov 3 23:30:54 2017 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/ac6b998a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
index 5c099c8..b10e54a 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
@@ -21,8 +21,10 @@ package org.apache.hadoop.hbase.rsgroup;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
 import org.apache.hadoop.hbase.Waiter;
+import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.testclassification.IntegrationTests;
 import org.junit.After;
 import org.junit.Before;
@@ -43,6 +45,10 @@ public class IntegrationTestRSGroup extends TestRSGroupsBase {
       LOG.info("Setting up IntegrationTestRSGroup");
       LOG.info("Initializing cluster with " + NUM_SLAVES_BASE + " servers");
       TEST_UTIL = new IntegrationTestingUtility();
+      TEST_UTIL.getConfiguration().set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS,
+        RSGroupBasedLoadBalancer.class.getName());
+      TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
+        RSGroupAdminEndpoint.class.getName());
       ((IntegrationTestingUtility)TEST_UTIL).initializeCluster(NUM_SLAVES_BASE);
       //set shared configs
       admin = TEST_UTIL.getAdmin();

[4/4] hbase git commit: HBASE-19173 Configure IntegrationTestRSGroup automatically for minicluster mode

Posted by ap...@apache.org.
HBASE-19173 Configure IntegrationTestRSGroup automatically for minicluster mode


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

Branch: refs/heads/branch-2
Commit: 65f620a85698f9c3fdd9b8c8f2fd69f9bb7cf825
Parents: 3a8e370
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Nov 3 17:38:32 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Nov 3 23:30:54 2017 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/65f620a8/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
index 5c099c8..b10e54a 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
@@ -21,8 +21,10 @@ package org.apache.hadoop.hbase.rsgroup;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
 import org.apache.hadoop.hbase.Waiter;
+import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.testclassification.IntegrationTests;
 import org.junit.After;
 import org.junit.Before;
@@ -43,6 +45,10 @@ public class IntegrationTestRSGroup extends TestRSGroupsBase {
       LOG.info("Setting up IntegrationTestRSGroup");
       LOG.info("Initializing cluster with " + NUM_SLAVES_BASE + " servers");
       TEST_UTIL = new IntegrationTestingUtility();
+      TEST_UTIL.getConfiguration().set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS,
+        RSGroupBasedLoadBalancer.class.getName());
+      TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
+        RSGroupAdminEndpoint.class.getName());
       ((IntegrationTestingUtility)TEST_UTIL).initializeCluster(NUM_SLAVES_BASE);
       //set shared configs
       admin = TEST_UTIL.getAdmin();