You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/05/31 03:05:28 UTC
hbase git commit: HBASE-15835 - Prevent
HBaseTestingUtility#startMiniCluster from throwing _HMasterAddress already in
use_ RuntimeException when another HBase thread is running
Repository: hbase
Updated Branches:
refs/heads/master a1f0c1cbb -> e6d613de7
HBASE-15835 - Prevent HBaseTestingUtility#startMiniCluster from throwing _HMasterAddress already in use_ RuntimeException when another HBase thread is running
Signed-off-by: stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e6d613de
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e6d613de
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e6d613de
Branch: refs/heads/master
Commit: e6d613de70decf2b0f21d61bfa066cca870d5a09
Parents: a1f0c1c
Author: Daniel Vimont <da...@commonvox.org>
Authored: Tue May 24 19:16:52 2016 +0900
Committer: stack <st...@apache.org>
Committed: Mon May 30 20:05:19 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/HBaseTestingUtility.java | 19 +++++++++++++-
.../hadoop/hbase/TestHBaseTestingUtility.java | 27 +++++++++++++++++++-
.../client/TestSnapshotCloneIndependence.java | 3 ---
.../hbase/mob/TestDefaultMobStoreFlusher.java | 3 ---
.../hbase/mob/TestExpiredMobFileCleaner.java | 3 ---
.../hbase/mob/TestMobDataBlockEncoding.java | 3 ---
.../hbase/mob/compactions/TestMobCompactor.java | 2 --
.../TestPartitionedMobCompactor.java | 4 +--
.../hbase/mob/mapreduce/TestMobSweepJob.java | 2 --
.../hbase/mob/mapreduce/TestMobSweepMapper.java | 2 --
.../mob/mapreduce/TestMobSweepReducer.java | 3 ---
.../hbase/regionserver/TestDeleteMobTable.java | 2 --
.../regionserver/TestMobStoreCompaction.java | 2 --
.../hbase/regionserver/TestMobStoreScanner.java | 2 --
.../hadoop/hbase/client/AbstractTestShell.java | 4 ---
.../hbase/client/rsgroup/TestShellRSGroups.java | 2 --
16 files changed, 45 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index b618d8c..7b35815 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -143,7 +143,10 @@ import org.apache.zookeeper.ZooKeeper.States;
* Not all methods work with the real cluster.
* Depends on log4j being on classpath and
* hbase-site.xml for logging and test-run configuration. It does not set
- * logging levels nor make changes to configuration parameters.
+ * logging levels.
+ * In the configuration properties, default values for master-info-port and
+ * region-server-port are overridden such that a random port will be assigned (thus
+ * avoiding port contention if another local HBase instance is already running).
* <p>To preserve test data directories, pass the system property "hbase.testing.preserve.testdir"
* setting it to true.
*/
@@ -310,6 +313,20 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
// a hbase checksum verification failure will cause unit tests to fail
ChecksumUtil.generateExceptionForChecksumFailureForTest(true);
+
+ // prevent contention for ports if other hbase thread(s) already running
+ if (conf != null) {
+ if (conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)
+ == HConstants.DEFAULT_MASTER_INFOPORT) {
+ conf.setInt(HConstants.MASTER_INFO_PORT, -1);
+ LOG.debug("Config property " + HConstants.MASTER_INFO_PORT + " changed to -1");
+ }
+ if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)
+ == HConstants.DEFAULT_REGIONSERVER_PORT) {
+ conf.setInt(HConstants.REGIONSERVER_PORT, -1);
+ LOG.debug("Config property " + HConstants.REGIONSERVER_PORT + " changed to -1");
+ }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
index 10c9d86..15d4bac 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
@@ -224,7 +225,7 @@ public class TestHBaseTestingUtility {
// kill another active zk server
currentActivePort = cluster2.killCurrentActiveZooKeeperServer();
assertTrue(currentActivePort >= defaultClientPort);
- assertTrue(cluster2.getClientPort() == currentActivePort);
+ assertTrue(cluster2.getClientPort() == currentActivePort);
assertEquals(2, cluster2.getBackupZooKeeperServerNum());
assertEquals(3, cluster2.getZooKeeperServerNum());
@@ -418,4 +419,28 @@ public class TestHBaseTestingUtility {
assertNotEquals(port1, port2);
Mockito.verify(random, Mockito.times(3)).nextInt(Mockito.any(Integer.class));
}
+
+ @Test
+ public void testOverridingOfDefaultPorts() {
+
+ // confirm that default port properties being overridden to "-1"
+ Configuration defaultConfig = HBaseConfiguration.create();
+ defaultConfig.setInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
+ defaultConfig.setInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT);
+ HBaseTestingUtility htu = new HBaseTestingUtility(defaultConfig);
+ assertEquals(-1, htu.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));
+ assertEquals(-1, htu.getConfiguration().getInt(HConstants.REGIONSERVER_PORT, 0));
+
+ // confirm that nonDefault (custom) port settings are NOT overridden
+ Configuration altConfig = HBaseConfiguration.create();
+ final int nonDefaultMasterInfoPort = 3333;
+ final int nonDefaultRegionServerPort = 4444;
+ altConfig.setInt(HConstants.MASTER_INFO_PORT, nonDefaultMasterInfoPort);
+ altConfig.setInt(HConstants.REGIONSERVER_PORT, nonDefaultRegionServerPort);
+ htu = new HBaseTestingUtility(altConfig);
+ assertEquals(nonDefaultMasterInfoPort,
+ htu.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));
+ assertEquals(nonDefaultRegionServerPort
+ , htu.getConfiguration().getInt(HConstants.REGIONSERVER_PORT, 0));
+ }
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
index 4a1d7f5..740e010 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java
@@ -94,9 +94,6 @@ public class TestSnapshotCloneIndependence {
conf.setInt(HConstants.REGION_SERVER_HIGH_PRIORITY_HANDLER_COUNT, 15);
// enable snapshot support
conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);
- // disable the ui
- conf.setInt("hbase.regionsever.info.port", -1);
- conf.setInt("hbase.master.info.port", -1);
// change the flush size to a small amount, regulating number of store files
conf.setInt("hbase.hregion.memstore.flush.size", 25000);
// so make sure we get a compaction when doing a load, but keep around
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java
index 94a2ed4..bea6cff 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestDefaultMobStoreFlusher.java
@@ -49,9 +49,6 @@ public class TestDefaultMobStoreFlusher {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
-
TEST_UTIL.startMiniCluster(1);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
index 267201f..e74b3de 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
@@ -53,9 +53,6 @@ public class TestExpiredMobFileCleaner {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
-
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java
index a376c96..1f8bcb2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java
@@ -55,9 +55,6 @@ public class TestMobDataBlockEncoding {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
-
TEST_UTIL.startMiniCluster(1);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
index c0ad2dd..863a855 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
@@ -113,8 +113,6 @@ public class TestMobCompactor {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
TEST_UTIL.getConfiguration()
.setLong(MobConstants.MOB_COMPACTION_MERGEABLE_THRESHOLD, 5000);
TEST_UTIL.getConfiguration().set(HConstants.CRYPTO_KEYPROVIDER_CONF_KEY,
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java
index 0e0bdbe..7970d62 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestPartitionedMobCompactor.java
@@ -78,8 +78,6 @@ public class TestPartitionedMobCompactor {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
TEST_UTIL.startMiniCluster(1);
pool = createThreadPool();
@@ -396,4 +394,4 @@ public class TestPartitionedMobCompactor {
conf.setInt(MobConstants.MOB_COMPACTION_BATCH_SIZE,
MobConstants.DEFAULT_MOB_COMPACTION_BATCH_SIZE);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepJob.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepJob.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepJob.java
index 3023849..666e193 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepJob.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepJob.java
@@ -47,8 +47,6 @@ public class TestMobSweepJob {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
TEST_UTIL.getConfiguration().set(CommonConfigurationKeys.IO_SERIALIZATIONS_KEY,
JavaSerialization.class.getName() + "," + WritableSerialization.class.getName());
TEST_UTIL.startMiniCluster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepMapper.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepMapper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepMapper.java
index 9e95a39..5ae02e4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepMapper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepMapper.java
@@ -54,8 +54,6 @@ public class TestMobSweepMapper {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
TEST_UTIL.startMiniCluster(1);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepReducer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepReducer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepReducer.java
index 8c24123..8cef4d9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepReducer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/mapreduce/TestMobSweepReducer.java
@@ -77,9 +77,6 @@ public class TestMobSweepReducer {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
-
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
TEST_UTIL.startMiniCluster(1);
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java
index 779fdca..fe2cb44 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java
@@ -50,8 +50,6 @@ public class TestDeleteMobTable {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
TEST_UTIL.startMiniCluster(1);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java
index f9ffc88..5cbca4b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreCompaction.java
@@ -85,8 +85,6 @@ public class TestMobStoreCompaction {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
UTIL.startMiniCluster(1);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java
index 04ad4c9..6a4aceb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java
@@ -78,8 +78,6 @@ public class TestMobStoreScanner {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setInt("hbase.master.info.port", 0);
- TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.info.port.auto", true);
TEST_UTIL.getConfiguration().setInt("hbase.client.keyvalue.maxsize", 100 * 1024 * 1024);
// TODO: AsyncFSWAL can not handle large edits right now, remove this after we fix the issue.
TEST_UTIL.getConfiguration().set(WALFactory.WAL_PROVIDER, "filesystem");
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
----------------------------------------------------------------------
diff --git a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
index f66bb6b..ddcc1ea 100644
--- a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
+++ b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
@@ -44,10 +44,6 @@ public abstract class AbstractTestShell {
TEST_UTIL.getConfiguration().setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false);
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
- //NOTE: Below Settings are disabled for taskmonitor_test
- TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, -1);
- TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, 0);
- TEST_UTIL.getConfiguration().setBoolean(HConstants.REGIONSERVER_INFO_PORT_AUTO, true);
// Security setup configuration
SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration());
VisibilityTestUtil.enableVisiblityLabels(TEST_UTIL.getConfiguration());
http://git-wip-us.apache.org/repos/asf/hbase/blob/e6d613de/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java
----------------------------------------------------------------------
diff --git a/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java b/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java
index be23a59..155bdb4 100644
--- a/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java
+++ b/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java
@@ -60,8 +60,6 @@ public class TestShellRSGroups {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
TEST_UTIL.getConfiguration().setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false);
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
- TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, -1);
- TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, -1);
// Security setup configuration
SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration());
VisibilityTestUtil.enableVisiblityLabels(TEST_UTIL.getConfiguration());