Repository: hbase Updated Branches: refs/heads/branch-1 895768dd7 -> e7c610b94
http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java index 6e2ff13..5c6769f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java @@ -26,6 +26,7 @@ import static org.junit.Assert.fail; import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadPoolExecutor; @@ -36,7 +37,9 @@ import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.exceptions.OperationConflictException; import org.apache.hadoop.hbase.ipc.RpcClient; @@ -150,10 +153,15 @@ public class TestMultiParallel { Table table = new HTable(UTIL.getConfiguration(), TEST_TABLE); List<Row> puts = constructPutRequests(); // creates a Put for every region table.batch(puts); + HashSet<ServerName> regionservers = new HashSet<ServerName>(); + for (byte[] k : KEYS) { + HRegionLocation location = ((HTable)table).getRegionLocation(k); + regionservers.add(location.getServerName()); + } Field poolField = table.getClass().getDeclaredField("pool"); poolField.setAccessible(true); ThreadPoolExecutor tExecutor = (ThreadPoolExecutor) poolField.get(table); - assertEquals(slaves, tExecutor.getLargestPoolSize()); + assertEquals(regionservers.size(), tExecutor.getLargestPoolSize()); table.close(); } @@ -306,9 +314,8 @@ public class TestMultiParallel { UTIL.waitFor(15 * 1000, new Waiter.Predicate<Exception>() { @Override public boolean evaluate() throws Exception { - // Master is also a regionserver, so the count is liveRScount return UTIL.getMiniHBaseCluster().getMaster() - .getClusterStatus().getServersSize() == liveRScount; + .getClusterStatus().getServersSize() == (liveRScount - 1); } }); UTIL.waitFor(15 * 1000, UTIL.predicateNoRegionsInTransition()); http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java index b822a3d..eee8c9a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java @@ -245,7 +245,8 @@ public class TestBlockReorder { MiniHBaseCluster hbm = htu.startMiniHBaseCluster(1, 1); hbm.waitForActiveAndReadyMaster(); - HRegionServer targetRs = hbm.getMaster(); + hbm.getRegionServer(0).waitForServerOnline(); + HRegionServer targetRs = hbm.getRegionServer(0); // We want to have a datanode with the same name as the region server, so // we're going to get the regionservername, and start a new datanode with this name. http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java index 82acdfd..da30d8b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java @@ -80,7 +80,6 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.coordination.BaseCoordinatedStateManager; -import org.apache.hadoop.hbase.coordination.SplitLogManagerCoordination; import org.apache.hadoop.hbase.coordination.ZKSplitLogManagerCoordination; import org.apache.hadoop.hbase.exceptions.OperationConflictException; import org.apache.hadoop.hbase.exceptions.RegionInRecoveryException; @@ -1461,21 +1460,6 @@ public class TestDistributedLogSplitting { putData(region, hri.getStartKey(), nrows, Bytes.toBytes("q"), family); } } - - for (MasterThread mt : cluster.getLiveMasterThreads()) { - HRegionServer hrs = mt.getMaster(); - List<HRegionInfo> hris = ProtobufUtil.getOnlineRegions(hrs.getRSRpcServices()); - for (HRegionInfo hri : hris) { - if (hri.getTable().isSystemTable()) { - continue; - } - LOG.debug("adding data to rs = " + mt.getName() + - " region = "+ hri.getRegionNameAsString()); - HRegion region = hrs.getOnlineRegion(hri.getRegionName()); - assertTrue(region != null); - putData(region, hri.getStartKey(), nrows, Bytes.toBytes("q"), family); - } - } } public void makeHLog(HLog log, List<HRegionInfo> regions, String tname, String fname, http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java index 6ca7d52..8dffe7d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java @@ -53,7 +53,6 @@ import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.coordination.BaseCoordinatedStateManager; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.executor.EventType; -import org.apache.hadoop.hbase.client.RegionLocator; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; @@ -1134,7 +1133,7 @@ public class TestMasterFailover { assertEquals(2, masterThreads.size()); int rsCount = masterThreads.get(activeIndex).getMaster().getClusterStatus().getServersSize(); LOG.info("Active master " + active.getServerName() + " managing " + rsCount + " regions servers"); - assertEquals(5, rsCount); + assertEquals(3, rsCount); // Check that ClusterStatus reports the correct active and backup masters assertNotNull(active); @@ -1167,7 +1166,7 @@ public class TestMasterFailover { int rss = status.getServersSize(); LOG.info("Active master " + mastername.getServerName() + " managing " + rss + " region servers"); - assertEquals(4, rss); + assertEquals(3, rss); // Stop the cluster TEST_UTIL.shutdownMiniCluster(); @@ -1177,6 +1176,7 @@ public class TestMasterFailover { * Test region in pending_open/close when master failover */ @Test (timeout=180000) + @SuppressWarnings("deprecation") public void testPendingOpenOrCloseWhenMasterFailover() throws Exception { final int NUM_MASTERS = 1; final int NUM_RS = 1; http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java index 2ee7d51..6ebaaab 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java @@ -116,7 +116,7 @@ public class TestMasterMetrics { @Test public void testDefaultMasterMetrics() throws Exception { MetricsMasterSource masterSource = master.getMasterMetrics().getMetricsSource(); - metricsHelper.assertGauge( "numRegionServers", 2, masterSource); + metricsHelper.assertGauge( "numRegionServers", 1, masterSource); metricsHelper.assertGauge( "averageLoad", 2, masterSource); metricsHelper.assertGauge( "numDeadRegionServers", 0, masterSource); http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java index cb1ffcd..5332bd7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java @@ -57,7 +57,7 @@ public class TestMasterMetricsWrapper { assertEquals(master.getMasterStartTime(), info.getStartTime()); assertEquals(master.getMasterCoprocessors().length, info.getCoprocessors().length); assertEquals(master.getServerManager().getOnlineServersList().size(), info.getNumRegionServers()); - assertEquals(5, info.getNumRegionServers()); + assertEquals(4, info.getNumRegionServers()); String zkServers = info.getZookeeperQuorum(); assertEquals(zkServers.split(",").length, TEST_UTIL.getZkCluster().getZooKeeperServerNum()); @@ -69,10 +69,10 @@ public class TestMasterMetricsWrapper { // We stopped the regionserver but could take a while for the master to notice it so hang here // until it does... then move forward to see if metrics wrapper notices. while (TEST_UTIL.getHBaseCluster().getMaster().getServerManager().getOnlineServers().size() != - 4) { + 3) { Threads.sleep(10); } - assertEquals(4, info.getNumRegionServers()); + assertEquals(3, info.getNumRegionServers()); assertEquals(1, info.getNumDeadRegionServers()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java index c5ed9e9..7fee323 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java @@ -167,14 +167,13 @@ public class TestRestartCluster { MiniHBaseCluster cluster = UTIL.getHBaseCluster(); List<JVMClusterUtil.RegionServerThread> threads = cluster.getLiveRegionServerThreads(); assertEquals(2, threads.size()); - int[] rsPorts = new int[3]; + int[] rsPorts = new int[2]; for (int i = 0; i < 2; i++) { rsPorts[i] = threads.get(i).getRegionServer().getServerName().getPort(); } - rsPorts[2] = cluster.getMaster().getServerName().getPort(); for (ServerName serverName: regionToRegionServerMap.values()) { boolean found = false; // Test only, no need to optimize - for (int k = 0; k < 3 && !found; k++) { + for (int k = 0; k < 2 && !found; k++) { found = serverName.getPort() == rsPorts[k]; } assertTrue(found); @@ -190,9 +189,9 @@ public class TestRestartCluster { LOG.info("\n\nStarting cluster the second time with the same ports"); try { cluster.getConf().setInt( - ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 4); + ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 2); master = cluster.startMaster().getMaster(); - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 2; i++) { cluster.getConf().setInt(HConstants.REGIONSERVER_PORT, rsPorts[i]); cluster.startRegionServer(); } @@ -200,13 +199,13 @@ public class TestRestartCluster { // Reset region server port so as not to conflict with other tests cluster.getConf().setInt(HConstants.REGIONSERVER_PORT, 0); cluster.getConf().setInt( - ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 2); + ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 1); } // Make sure live regionservers are on the same host/port List<ServerName> localServers = master.getServerManager().getOnlineServersList(); - assertEquals(4, localServers.size()); - for (int i = 0; i < 3; i++) { + assertEquals(2, localServers.size()); + for (int i = 0; i < 2; i++) { boolean found = false; for (ServerName serverName: localServers) { if (serverName.getPort() == rsPorts[i]) { http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java index 7216abd..55c91f4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/BalancerTestBase.java @@ -215,7 +215,7 @@ public class BalancerTestBase { protected BaseLoadBalancer.Cluster mockCluster(int[] mockCluster) { return new BaseLoadBalancer.Cluster(null, - mockClusterServers(mockCluster, -1), null, null, null, null, null); + mockClusterServers(mockCluster, -1), null, null, null, null); } protected TreeMap<ServerName, List<HRegionInfo>> mockClusterServers(int[] mockCluster, int numTables) { http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java index 625486d..40d9035 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java @@ -18,7 +18,6 @@ package org.apache.hadoop.hbase.master.balancer; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -36,19 +35,17 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.RegionReplicaUtil; import org.apache.hadoop.hbase.master.LoadBalancer; import org.apache.hadoop.hbase.master.MasterServices; +import org.apache.hadoop.hbase.master.RackManager; import org.apache.hadoop.hbase.master.RegionPlan; import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.RegionReplicaUtil; -import org.apache.hadoop.hbase.master.RackManager; import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster.MoveRegionAction; import org.junit.BeforeClass; import org.junit.Test; @@ -245,7 +242,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase { // cluster is created (constructor code) would make sure the indices of // the servers are in the order in which it is inserted in the clusterState // map (linkedhashmap is important). A similar thing applies to the region lists - Cluster cluster = new Cluster(master, clusterState, null, null, null, null, rackManager); + Cluster cluster = new Cluster(master, clusterState, null, null, null, rackManager); // check whether a move of region1 from servers[0] to servers[1] would lower // the availability of region1 assertTrue(cluster.wouldLowerAvailability(hri1, servers[1])); @@ -262,7 +259,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase { // now lets have servers[1] host replica_of_region2 list1.add(RegionReplicaUtil.getRegionInfoForReplica(hri3, 1)); // create a new clusterState with the above change - cluster = new Cluster(master, clusterState, null, null, null, null, rackManager); + cluster = new Cluster(master, clusterState, null, null, null, rackManager); // now check whether a move of a replica from servers[0] to servers[1] would lower // the availability of region2 assertTrue(cluster.wouldLowerAvailability(hri3, servers[1])); @@ -274,14 +271,14 @@ public class TestBaseLoadBalancer extends BalancerTestBase { clusterState.put(servers[6], list2); //servers[6], rack2 hosts region2 clusterState.put(servers[10], new ArrayList<HRegionInfo>()); //servers[10], rack3 hosts no region // create a cluster with the above clusterState - cluster = new Cluster(master, clusterState, null, null, null, null, rackManager); + cluster = new Cluster(master, clusterState, null, null, null, rackManager); // check whether a move of region1 from servers[0],rack1 to servers[6],rack2 would // lower the availability assertTrue(cluster.wouldLowerAvailability(hri1, servers[0])); // now create a cluster without the rack manager - cluster = new Cluster(master, clusterState, null, null, null, null, null); + cluster = new Cluster(master, clusterState, null, null, null, null); // now repeat check whether a move of region1 from servers[0] to servers[6] would // lower the availability assertTrue(!cluster.wouldLowerAvailability(hri1, servers[6])); @@ -314,7 +311,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase { // cluster is created (constructor code) would make sure the indices of // the servers are in the order in which it is inserted in the clusterState // map (linkedhashmap is important). - Cluster cluster = new Cluster(master, clusterState, null, null, null, null, rackManager); + Cluster cluster = new Cluster(master, clusterState, null, null, null, rackManager); // check whether moving region1 from servers[1] to servers[2] would lower availability assertTrue(!cluster.wouldLowerAvailability(hri1, servers[2])); @@ -334,7 +331,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase { clusterState.put(servers[6], list2); //servers[6], rack2 hosts region2 clusterState.put(servers[12], list3); //servers[12], rack3 hosts replica_of_region2 // create a cluster with the above clusterState - cluster = new Cluster(master, clusterState, null, null, null, null, rackManager); + cluster = new Cluster(master, clusterState, null, null, null, rackManager); // check whether a move of replica_of_region2 from servers[12],rack3 to servers[0],rack1 would // lower the availability assertTrue(!cluster.wouldLowerAvailability(hri4, servers[0])); @@ -420,7 +417,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase { assignRegions(regions, oldServers, clusterState); // should not throw exception: - BaseLoadBalancer.Cluster cluster = new Cluster(null, clusterState, null, null, null, null, null); + BaseLoadBalancer.Cluster cluster = new Cluster(null, clusterState, null, null, null, null); assertEquals(101 + 9, cluster.numRegions); assertEquals(10, cluster.numServers); // only 10 servers because they share the same host + port } @@ -462,7 +459,7 @@ public class TestBaseLoadBalancer extends BalancerTestBase { when(locationFinder.getTopBlockLocations(regions.get(43))).thenReturn( Lists.newArrayList(ServerName.valueOf("foo", 0, 0))); // this server does not exists in clusterStatus - BaseLoadBalancer.Cluster cluster = new Cluster(null, clusterState, null, locationFinder, null, null, null); + BaseLoadBalancer.Cluster cluster = new Cluster(null, clusterState, null, locationFinder, null, null); int r0 = ArrayUtils.indexOf(cluster.regions, regions.get(0)); // this is ok, it is just a test int r1 = ArrayUtils.indexOf(cluster.regions, regions.get(1)); @@ -498,49 +495,4 @@ public class TestBaseLoadBalancer extends BalancerTestBase { assertEquals(1, cluster.regionLocations[r43].length); assertEquals(-1, cluster.regionLocations[r43][0]); } - - @Test - public void testBackupMastersExcluded() throws HBaseIOException { - ClusterStatus st = Mockito.mock(ClusterStatus.class); - ArrayList<ServerName> backupMasters = new ArrayList<ServerName>(); - ServerName backupMaster = ServerName.valueOf("fake-backupmaster", 0, 1L); - backupMasters.add(backupMaster); - BaseLoadBalancer balancer = (BaseLoadBalancer)loadBalancer; - balancer.usingBackupMasters = false; - Mockito.when(st.getBackupMasters()).thenReturn(backupMasters); - loadBalancer.setClusterStatus(st); - assertEquals(backupMasters.size(), balancer.excludedServers.size()); - assertTrue(balancer.excludedServers.contains(backupMaster)); - - // Round robin assignment - List<HRegionInfo> regions = randomRegions(1); - HRegionInfo region = regions.get(0); - assertNull(loadBalancer.randomAssignment(region, backupMasters)); - assertNull(loadBalancer.roundRobinAssignment(regions, backupMasters)); - HashMap<HRegionInfo, ServerName> assignments = new HashMap<HRegionInfo, ServerName>(); - assignments.put(region, backupMaster); - assertNull(loadBalancer.retainAssignment(assignments, backupMasters)); - ArrayList<ServerName> servers = new ArrayList<ServerName>(backupMasters); - ServerName sn = ServerName.valueOf("fake-rs", 0, 1L); - servers.add(sn); - assertEquals(sn, loadBalancer.randomAssignment(region, servers)); - Map<ServerName, List<HRegionInfo>> plans = - loadBalancer.roundRobinAssignment(regions, servers); - assertEquals(1, plans.size()); - assertTrue(plans.get(sn).contains(region)); - - // Retain assignment - plans = loadBalancer.retainAssignment(assignments, servers); - assertEquals(1, plans.size()); - assertTrue(plans.get(sn).contains(region)); - - // Filter backup masters for balance cluster - Map<ServerName, List<HRegionInfo>> clusterMap = - new HashMap<ServerName, List<HRegionInfo>>(); - clusterMap.put(backupMaster, new ArrayList<HRegionInfo>()); - clusterMap.put(sn, new ArrayList<HRegionInfo>()); - balancer.filterExcludedServers(clusterMap); - assertTrue(clusterMap.containsKey(sn)); - assertEquals(1, clusterMap.size()); - } } http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java index 9b7ade8..2a4278f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java @@ -17,14 +17,8 @@ */ package org.apache.hadoop.hbase.master.balancer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,13 +27,11 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.master.LoadBalancer; import org.apache.hadoop.hbase.master.RegionPlan; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.mockito.Mockito; /** * Test the load balancer that is created by default. @@ -133,43 +125,4 @@ public class TestDefaultLoadBalancer extends BalancerTestBase { } } } - - @Test - public void testBalancerClusterWithBackupMaster() throws Exception { - SimpleLoadBalancer balancer = Mockito.spy(new SimpleLoadBalancer()); - balancer.setConf(HBaseConfiguration.create()); - List<ServerName> backupMasters = new ArrayList<ServerName>(); - ServerName backupMaster = ServerName.parseServerName("backup:1:1"); - ServerName rs = ServerName.parseServerName("rs:1:1"); - backupMasters.add(backupMaster); - Mockito.doReturn(backupMasters).when(balancer).getBackupMasters(); - Map<ServerName, List<HRegionInfo>> servers = new TreeMap<ServerName, List<HRegionInfo>>(); - List<HRegionInfo> regions = new ArrayList<HRegionInfo>(); - TableName table = TableName.valueOf("test"); - regions.add(new HRegionInfo(table)); - servers.put(backupMaster, regions); - regions = new ArrayList<HRegionInfo>(); - balancer.backupMasterWeight = 4; - for (int i=0; i<4; i++) { - regions.add(new HRegionInfo(table)); - } - servers.put(rs, regions); - List<RegionPlan> plans = balancer.balanceCluster(servers); - assertNull(plans); - - // Reset the cluster map - regions = new ArrayList<HRegionInfo>(); - for (int i=0; i<2; i++) { - regions.add(new HRegionInfo(table)); - } - servers.put(backupMaster, regions); - regions = new ArrayList<HRegionInfo>(); - for (int i=0; i<3; i++) { - regions.add(new HRegionInfo(table)); - } - servers.put(rs, regions); - plans = balancer.balanceCluster(servers); - assertNotNull(plans); - assertEquals(1, plans.size()); - } } http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java index 7c7ac49..e9cc642 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java @@ -193,7 +193,7 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { public void testSkewCost() { Configuration conf = HBaseConfiguration.create(); StochasticLoadBalancer.CostFunction - costFunction = new StochasticLoadBalancer.RegionCountSkewCostFunction(conf, 1); + costFunction = new StochasticLoadBalancer.RegionCountSkewCostFunction(conf); for (int[] mockCluster : clusterStateMocks) { costFunction.init(mockCluster(mockCluster)); double cost = costFunction.cost(); @@ -318,7 +318,7 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { BaseLoadBalancer.Cluster cluster; - cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null, null); + cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null); costFunction.init(cluster); double costWithoutReplicas = costFunction.cost(); assertEquals(0, costWithoutReplicas, 0); @@ -328,7 +328,7 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { clusterState.firstEntry().getValue().get(0),1); clusterState.lastEntry().getValue().add(replica1); - cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null, null); + cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null); costFunction.init(cluster); double costWith1ReplicaDifferentServer = costFunction.cost(); @@ -338,7 +338,7 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { HRegionInfo replica2 = RegionReplicaUtil.getRegionInfoForReplica(replica1, 2); clusterState.lastEntry().getValue().add(replica2); - cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null, null); + cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null); costFunction.init(cluster); double costWith1ReplicaSameServer = costFunction.cost(); @@ -361,7 +361,7 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { entry.getValue().add(replica2); it.next().getValue().add(replica3); //2nd server - cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null, null); + cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null); costFunction.init(cluster); double costWith3ReplicasSameServer = costFunction.cost(); @@ -375,7 +375,7 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { clusterState.lastEntry().getValue().add(replica2); clusterState.lastEntry().getValue().add(replica3); - cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null, null); + cluster = new BaseLoadBalancer.Cluster(master, clusterState, null, null, null, null); costFunction.init(cluster); double costWith2ReplicasOnTwoServers = costFunction.cost(); @@ -395,7 +395,7 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { // until the step above s1 holds two replicas of a region regions = randomRegions(1); map.put(s2, regions); - assertTrue(loadBalancer.needsBalance(new Cluster(master, map, null, null, null, null, null))); + assertTrue(loadBalancer.needsBalance(new Cluster(master, map, null, null, null, null))); // check for the case where there are two hosts on the same rack and there are two racks // and both the replicas are on the same rack map.clear(); @@ -406,7 +406,7 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { map.put(s2, regionsOnS2); // add another server so that the cluster has some host on another rack map.put(ServerName.valueOf("host2", 1000, 11111), randomRegions(1)); - assertTrue(loadBalancer.needsBalance(new Cluster(master, map, null, null, null, null, + assertTrue(loadBalancer.needsBalance(new Cluster(master, map, null, null, null, new ForTestRackManagerOne()))); } http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java index ff2716c..e2fff51 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java @@ -81,7 +81,7 @@ public class TestClusterId { //Make sure RS is in blocking state Thread.sleep(10000); - TEST_UTIL.startMiniHBaseCluster(1, 0); + TEST_UTIL.startMiniHBaseCluster(1, 1); rst.waitForServerOnline(); @@ -110,7 +110,7 @@ public class TestClusterId { } TEST_UTIL.startMiniHBaseCluster(1, 1); HMaster master = TEST_UTIL.getHBaseCluster().getMaster(); - assertEquals(2, master.getServerManager().getOnlineServersList().size()); + assertEquals(1, master.getServerManager().getOnlineServersList().size()); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java index 87311a0..6474946 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java @@ -91,11 +91,11 @@ public class TestRSKilledWhenInitializing { Thread.sleep(10000); List<ServerName> onlineServersList = master.getMaster().getServerManager().getOnlineServersList(); - while (onlineServersList.size() > 2) { + while (onlineServersList.size() > 1) { Thread.sleep(100); onlineServersList = master.getMaster().getServerManager().getOnlineServersList(); } - assertEquals(onlineServersList.size(), 2); + assertEquals(onlineServersList.size(), 1); cluster.shutdown(); } finally { masterActive = false; http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java index 20cc8e5..eb65b5e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java @@ -58,7 +58,6 @@ import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.ZooKeeperConnectionException; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.Consistency; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -69,8 +68,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.coordination.ZKSplitTransactionCoordination; import org.apache.hadoop.hbase.coordination.ZkCloseRegionCoordination; +import org.apache.hadoop.hbase.coordination.ZkOpenRegionCoordination; import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.client.TestReplicasClient.SlowMeCopro; import org.apache.hadoop.hbase.coordination.ZkCoordinatedStateManager; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; import org.apache.hadoop.hbase.coprocessor.ObserverContext; @@ -113,6 +112,7 @@ import com.google.protobuf.ServiceException; * is tests against a bare {@link HRegion}. */ @Category(LargeTests.class) +@SuppressWarnings("deprecation") public class TestSplitTransactionOnCluster { private static final Log LOG = LogFactory.getLog(TestSplitTransactionOnCluster.class); @@ -182,7 +182,6 @@ public class TestSplitTransactionOnCluster { return hri; } - @SuppressWarnings("deprecation") @Test(timeout = 60000) public void testShouldFailSplitIfZNodeDoesNotExistDueToPrevRollBack() throws Exception { final TableName tableName = @@ -323,7 +322,6 @@ public class TestSplitTransactionOnCluster { } } @Test(timeout = 60000) - @SuppressWarnings("deprecation") public void testSplitFailedCompactionAndSplit() throws Exception { final byte[] tableName = Bytes.toBytes("testSplitFailedCompactionAndSplit"); Configuration conf = TESTING_UTIL.getConfiguration(); @@ -1135,6 +1133,7 @@ public class TestSplitTransactionOnCluster { this.watcher = server.getZooKeeper(); splitTransactionCoordination = new MockedSplitTransactionCoordination(this, watcher, region); closeRegionCoordination = new ZkCloseRegionCoordination(this, watcher); + openRegionCoordination = new ZkOpenRegionCoordination(this, watcher); } } @@ -1285,12 +1284,12 @@ public class TestSplitTransactionOnCluster { admin.move(hri.getEncodedNameAsBytes(), Bytes.toBytes(hrs.getServerName().toString())); } // Wait till table region is up on the server that is NOT carrying hbase:meta. - for (int i = 0; i < 100; i++) { + for (int i = 0; i < 20; i++) { tableRegionIndex = cluster.getServerWith(hri.getRegionName()); if (tableRegionIndex != -1 && tableRegionIndex != metaServerIndex) break; LOG.debug("Waiting on region move off the hbase:meta server; current index " + tableRegionIndex + " and metaServerIndex=" + metaServerIndex); - Thread.sleep(100); + Thread.sleep(1000); } assertTrue("Region not moved off hbase:meta server", tableRegionIndex != -1 && tableRegionIndex != metaServerIndex); http://git-wip-us.apache.org/repos/asf/hbase/blob/e7c610b9/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java index 0990dd9..b1884e9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java @@ -79,7 +79,7 @@ public class TestNamespaceCommands extends SecureTestUtil { UTIL.waitTableAvailable(AccessControlLists.ACL_TABLE_NAME.getName(), 30 * 1000); ACCESS_CONTROLLER = (AccessController) UTIL.getMiniHBaseCluster().getMaster() - .getRegionServerCoprocessorHost() + .getMasterCoprocessorHost() .findCoprocessor(AccessController.class.getName()); UTIL.getHBaseAdmin().createNamespace(NamespaceDescriptor.create(TestNamespace).build());
