Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java Tue Mar 25 19:34:52 2014 @@ -24,7 +24,6 @@ import static org.junit.Assert.assertTru import java.io.IOException; -import com.google.protobuf.HBaseZeroCopyByteString; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; @@ -43,6 +42,7 @@ import org.junit.experimental.categories import org.mockito.Mockito; import com.google.protobuf.ByteString; +import com.google.protobuf.HBaseZeroCopyByteString; /** * Tests that verify certain RPCs get a higher QoS. @@ -55,13 +55,14 @@ public class TestPriorityRpc { @Before public void setup() { Configuration conf = HBaseConfiguration.create(); + conf.setBoolean("hbase.testing.nocluster", true); // No need to do ZK regionServer = HRegionServer.constructRegionServer(HRegionServer.class, conf); - priority = regionServer.getPriority(); + priority = regionServer.rpcServices.getPriority(); } @Test public void testQosFunctionForMeta() throws IOException { - priority = regionServer.getPriority(); + priority = regionServer.rpcServices.getPriority(); RequestHeader.Builder headerBuilder = RequestHeader.newBuilder(); //create a rpc request that has references to hbase:meta region and also //uses one of the known argument classes (known argument classes are @@ -82,8 +83,10 @@ public class TestPriorityRpc { RequestHeader header = headerBuilder.build(); HRegion mockRegion = Mockito.mock(HRegion.class); HRegionServer mockRS = Mockito.mock(HRegionServer.class); + RSRpcServices mockRpc = Mockito.mock(RSRpcServices.class); + Mockito.when(mockRS.getRSRpcServices()).thenReturn(mockRpc); HRegionInfo mockRegionInfo = Mockito.mock(HRegionInfo.class); - Mockito.when(mockRS.getRegion((RegionSpecifier)Mockito.any())).thenReturn(mockRegion); + Mockito.when(mockRpc.getRegion((RegionSpecifier)Mockito.any())).thenReturn(mockRegion); Mockito.when(mockRegion.getRegionInfo()).thenReturn(mockRegionInfo); Mockito.when(mockRegionInfo.isMetaTable()).thenReturn(true); // Presume type. @@ -100,7 +103,7 @@ public class TestPriorityRpc { RequestHeader.Builder headerBuilder = RequestHeader.newBuilder(); headerBuilder.setMethodName("foo"); RequestHeader header = headerBuilder.build(); - PriorityFunction qosFunc = regionServer.getPriority(); + PriorityFunction qosFunc = regionServer.rpcServices.getPriority(); assertEquals(HConstants.NORMAL_QOS, qosFunc.getPriority(header, null)); } @@ -115,8 +118,10 @@ public class TestPriorityRpc { ScanRequest scanRequest = scanBuilder.build(); HRegion mockRegion = Mockito.mock(HRegion.class); HRegionServer mockRS = Mockito.mock(HRegionServer.class); + RSRpcServices mockRpc = Mockito.mock(RSRpcServices.class); + Mockito.when(mockRS.getRSRpcServices()).thenReturn(mockRpc); HRegionInfo mockRegionInfo = Mockito.mock(HRegionInfo.class); - Mockito.when(mockRS.getRegion((RegionSpecifier)Mockito.any())).thenReturn(mockRegion); + Mockito.when(mockRpc.getRegion((RegionSpecifier)Mockito.any())).thenReturn(mockRegion); Mockito.when(mockRegion.getRegionInfo()).thenReturn(mockRegionInfo); Mockito.when(mockRegionInfo.isMetaRegion()).thenReturn(false); // Presume type. @@ -130,9 +135,9 @@ public class TestPriorityRpc { scanRequest = scanBuilder.build(); //mock out a high priority type handling and see the QoS returned RegionScanner mockRegionScanner = Mockito.mock(RegionScanner.class); - Mockito.when(mockRS.getScanner(12345)).thenReturn(mockRegionScanner); + Mockito.when(mockRpc.getScanner(12345)).thenReturn(mockRegionScanner); Mockito.when(mockRegionScanner.getRegionInfo()).thenReturn(mockRegionInfo); - Mockito.when(mockRS.getRegion((RegionSpecifier)Mockito.any())).thenReturn(mockRegion); + Mockito.when(mockRpc.getRegion((RegionSpecifier)Mockito.any())).thenReturn(mockRegion); Mockito.when(mockRegion.getRegionInfo()).thenReturn(mockRegionInfo); Mockito.when(mockRegionInfo.isMetaRegion()).thenReturn(true);
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java Tue Mar 25 19:34:52 2014 @@ -36,8 +36,9 @@ import com.google.protobuf.Message; public class TestQosFunction { @Test public void testPriority() { - HRegionServer hrs = Mockito.mock(HRegionServer.class); - AnnotationReadingPriorityFunction qosFunction = new AnnotationReadingPriorityFunction(hrs); + RSRpcServices rpcServices = Mockito.mock(RSRpcServices.class); + AnnotationReadingPriorityFunction qosFunction = + new AnnotationReadingPriorityFunction(rpcServices); // Set method name in pb style with the method name capitalized. checkMethod("ReplicateWALEntry", HConstants.REPLICATION_QOS, qosFunction); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java Tue Mar 25 19:34:52 2014 @@ -24,8 +24,6 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; @@ -47,8 +45,6 @@ import org.junit.experimental.categories */ @Category(LargeTests.class) public class TestRSKilledWhenInitializing { - private static final Log LOG = LogFactory.getLog(TestRSKilledWhenInitializing.class); - private static boolean masterActive = false; private static AtomicBoolean firstRS = new AtomicBoolean(true); @@ -77,7 +73,7 @@ public class TestRSKilledWhenInitializin master.start(); try { long startTime = System.currentTimeMillis(); - while (!master.getMaster().isActiveMaster()) { + while (!master.getMaster().isInitialized()) { try { Thread.sleep(100); } catch (InterruptedException ignored) { @@ -92,11 +88,11 @@ public class TestRSKilledWhenInitializin Thread.sleep(10000); List<ServerName> onlineServersList = master.getMaster().getServerManager().getOnlineServersList(); - while (onlineServersList.size() != 1) { + while (onlineServersList.size() > 2) { Thread.sleep(100); onlineServersList = master.getMaster().getServerManager().getOnlineServersList(); } - assertEquals(onlineServersList.size(), 1); + assertEquals(onlineServersList.size(), 2); cluster.shutdown(); } finally { masterActive = false; Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java Tue Mar 25 19:34:52 2014 @@ -51,10 +51,11 @@ import com.google.protobuf.ServiceExcept @Category(SmallTests.class) public class TestRSStatusServlet { private HRegionServer rs; - + private RSRpcServices rpcServices; + static final int FAKE_IPC_PORT = 1585; static final int FAKE_WEB_PORT = 1586; - + private final ServerName fakeServerName = ServerName.valueOf("localhost", FAKE_IPC_PORT, 11111); private final GetServerInfoResponse fakeResponse = @@ -66,9 +67,11 @@ public class TestRSStatusServlet { @Before public void setupBasicMocks() throws IOException, ServiceException { rs = Mockito.mock(HRegionServer.class); + rpcServices = Mockito.mock(RSRpcServices.class); Mockito.doReturn(HBaseConfiguration.create()) .when(rs).getConfiguration(); - Mockito.doReturn(fakeResponse).when(rs).getServerInfo( + Mockito.doReturn(rpcServices).when(rs).getRSRpcServices(); + Mockito.doReturn(fakeResponse).when(rpcServices).getServerInfo( (RpcController)Mockito.any(), (GetServerInfoRequest)Mockito.any()); // Fake ZKW ZooKeeperWatcher zkw = Mockito.mock(ZooKeeperWatcher.class); @@ -82,7 +85,7 @@ public class TestRSStatusServlet { MetricsRegionServer rms = Mockito.mock(MetricsRegionServer.class); Mockito.doReturn(new MetricsRegionServerWrapperStub()).when(rms).getRegionServerWrapper(); - Mockito.doReturn(rms).when(rs).getMetrics(); + Mockito.doReturn(rms).when(rs).getRegionServerMetrics(); } @Test @@ -98,7 +101,7 @@ public class TestRSStatusServlet { new HRegionInfo(htd.getTableName(), Bytes.toBytes("d"), Bytes.toBytes("z")) ); Mockito.doReturn(ResponseConverter.buildGetOnlineRegionResponse( - regions)).when(rs).getOnlineRegion((RpcController)Mockito.any(), + regions)).when(rpcServices).getOnlineRegion((RpcController)Mockito.any(), (GetOnlineRegionRequest)Mockito.any()); new RSStatusTmpl().render(new StringWriter(), rs); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java Tue Mar 25 19:34:52 2014 @@ -17,8 +17,6 @@ */ package org.apache.hadoop.hbase.regionserver; -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.client.*; @@ -38,7 +36,6 @@ import java.io.IOException; @Category(MediumTests.class) public class TestRegionServerMetrics { - private static final Log LOG = LogFactory.getLog(TestRegionServerMetrics.class); private static MetricsAssertHelper metricsHelper; static { @@ -72,7 +69,7 @@ public class TestRegionServerMetrics { } rs = cluster.getRegionServer(0); - metricsRegionServer = rs.getMetrics(); + metricsRegionServer = rs.getRegionServerMetrics(); serverSource = metricsRegionServer.getMetricsSource(); } @@ -105,8 +102,6 @@ public class TestRegionServerMetrics { byte[] row = Bytes.toBytes("rk"); byte[] qualifier = Bytes.toBytes("qual"); byte[] initValue = Bytes.toBytes("Value"); - byte[] nextValue = Bytes.toBytes("NEXT VAL"); - TEST_UTIL.createTable(tName, cfName); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java Tue Mar 25 19:34:52 2014 @@ -28,15 +28,19 @@ import org.apache.hadoop.hbase.HTableDes import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.catalog.MetaEditor; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.executor.EventType; +import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequest; import org.apache.hadoop.hbase.regionserver.handler.OpenRegionHandler; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.zookeeper.MetaRegionTracker; import org.apache.hadoop.hbase.zookeeper.ZKAssign; +import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -79,6 +83,22 @@ public class TestRegionServerNoMaster { // No master HTU.getHBaseCluster().getMaster().stopMaster(); + + // Master is down, so is the meta. We need to assign it somewhere + // so that regions can be assigned during the mocking phase. + HRegionServer hrs = HTU.getHBaseCluster().getRegionServer(0); + ZooKeeperWatcher zkw = hrs.getZooKeeper(); + ZKAssign.createNodeOffline( + zkw, HRegionInfo.FIRST_META_REGIONINFO, hrs.getServerName()); + ProtobufUtil.openRegion(hrs.getRSRpcServices(), + hrs.getServerName(), HRegionInfo.FIRST_META_REGIONINFO); + while (true) { + ServerName sn = MetaRegionTracker.getMetaRegionLocation(zkw); + if (sn != null && sn.equals(hrs.getServerName())) { + break; + } + Thread.sleep(100); + } } @AfterClass @@ -108,8 +128,9 @@ public class TestRegionServerNoMaster { // We reopen. We need a ZK node here, as a open is always triggered by a master. ZKAssign.createNodeOffline(HTU.getZooKeeperWatcher(), hri, getRS().getServerName()); // first version is '0' - AdminProtos.OpenRegionRequest orr = RequestConverter.buildOpenRegionRequest(getRS().getServerName(), hri, 0, null); - AdminProtos.OpenRegionResponse responseOpen = getRS().openRegion(null, orr); + AdminProtos.OpenRegionRequest orr = + RequestConverter.buildOpenRegionRequest(getRS().getServerName(), hri, 0, null); + AdminProtos.OpenRegionResponse responseOpen = getRS().rpcServices.openRegion(null, orr); Assert.assertTrue(responseOpen.getOpeningStateCount() == 1); Assert.assertTrue(responseOpen.getOpeningState(0). equals(AdminProtos.OpenRegionResponse.RegionOpeningState.OPENED)); @@ -155,7 +176,7 @@ public class TestRegionServerNoMaster { // no transition in ZK AdminProtos.CloseRegionRequest crr = RequestConverter.buildCloseRegionRequest(getRS().getServerName(), regionName, false); - AdminProtos.CloseRegionResponse responseClose = getRS().closeRegion(null, crr); + AdminProtos.CloseRegionResponse responseClose = getRS().rpcServices.closeRegion(null, crr); Assert.assertTrue(responseClose.getClosed()); // now waiting & checking. After a while, the transition should be done and the region closed @@ -175,7 +196,7 @@ public class TestRegionServerNoMaster { // Transition in ZK on. This should fail, as there is no znode AdminProtos.CloseRegionRequest crr = RequestConverter.buildCloseRegionRequest( getRS().getServerName(), regionName, true); - AdminProtos.CloseRegionResponse responseClose = getRS().closeRegion(null, crr); + AdminProtos.CloseRegionResponse responseClose = getRS().rpcServices.closeRegion(null, crr); Assert.assertTrue(responseClose.getClosed()); // now waiting. After a while, the transition should be done @@ -194,7 +215,7 @@ public class TestRegionServerNoMaster { AdminProtos.CloseRegionRequest crr = RequestConverter.buildCloseRegionRequest( getRS().getServerName(), regionName, true); - AdminProtos.CloseRegionResponse responseClose = getRS().closeRegion(null, crr); + AdminProtos.CloseRegionResponse responseClose = getRS().rpcServices.closeRegion(null, crr); Assert.assertTrue(responseClose.getClosed()); checkRegionIsClosed(); @@ -228,7 +249,7 @@ public class TestRegionServerNoMaster { // We're sending multiple requests in a row. The region server must handle this nicely. for (int i = 0; i < 10; i++) { AdminProtos.OpenRegionRequest orr = RequestConverter.buildOpenRegionRequest(getRS().getServerName(), hri, 0, null); - AdminProtos.OpenRegionResponse responseOpen = getRS().openRegion(null, orr); + AdminProtos.OpenRegionResponse responseOpen = getRS().rpcServices.openRegion(null, orr); Assert.assertTrue(responseOpen.getOpeningStateCount() == 1); AdminProtos.OpenRegionResponse.RegionOpeningState ors = responseOpen.getOpeningState(0); @@ -246,10 +267,15 @@ public class TestRegionServerNoMaster { Assert.assertTrue(getRS().getRegion(regionName).isAvailable()); try { + // we re-opened meta so some of its data is lost + ServerName sn = getRS().getServerName(); + MetaEditor.updateRegionLocation(getRS().catalogTracker, + hri, sn, getRS().getRegion(regionName).getOpenSeqNum()); // fake region to be closing now, need to clear state afterwards getRS().regionsInTransitionInRS.put(hri.getEncodedNameAsBytes(), Boolean.FALSE); - AdminProtos.OpenRegionRequest orr = RequestConverter.buildOpenRegionRequest(getRS().getServerName(), hri, 0, null); - getRS().openRegion(null, orr); + AdminProtos.OpenRegionRequest orr = + RequestConverter.buildOpenRegionRequest(sn, hri, 0, null); + getRS().rpcServices.openRegion(null, orr); Assert.fail("The closing region should not be opened"); } catch (ServiceException se) { Assert.assertTrue("The region should be already in transition", @@ -268,7 +294,7 @@ public class TestRegionServerNoMaster { AdminProtos.CloseRegionRequest crr = RequestConverter.buildCloseRegionRequest(getRS().getServerName(), regionName, 0, null, true); try { - AdminProtos.CloseRegionResponse responseClose = getRS().closeRegion(null, crr); + AdminProtos.CloseRegionResponse responseClose = getRS().rpcServices.closeRegion(null, crr); Assert.assertEquals("The first request should succeeds", 0, i); Assert.assertTrue("request " + i + " failed", responseClose.getClosed() || responseClose.hasClosed()); @@ -304,7 +330,7 @@ public class TestRegionServerNoMaster { AdminProtos.CloseRegionRequest crr = RequestConverter.buildCloseRegionRequest(getRS().getServerName(), regionName, false); try { - getRS().closeRegion(null, crr); + getRS().rpcServices.closeRegion(null, crr); Assert.assertTrue(false); } catch (ServiceException expected) { } @@ -322,7 +348,7 @@ public class TestRegionServerNoMaster { // The open handler should have updated the value in ZK. Assert.assertTrue(ZKAssign.deleteNode( - getRS().getZooKeeperWatcher(), hri.getEncodedName(), + getRS().getZooKeeper(), hri.getEncodedName(), EventType.RS_ZK_REGION_FAILED_OPEN, 1) ); @@ -347,7 +373,7 @@ public class TestRegionServerNoMaster { AdminProtos.CloseRegionRequest crr = RequestConverter.buildCloseRegionRequest(getRS().getServerName(), regionName, false); try { - getRS().closeRegion(null, crr); + getRS().rpcServices.closeRegion(null, crr); Assert.assertTrue(false); } catch (ServiceException expected) { Assert.assertTrue(expected.getCause() instanceof NotServingRegionException); @@ -355,7 +381,7 @@ public class TestRegionServerNoMaster { // The close should have left the ZK state as it is: it's the job the AM to delete it Assert.assertTrue(ZKAssign.deleteNode( - getRS().getZooKeeperWatcher(), hri.getEncodedName(), + getRS().getZooKeeper(), hri.getEncodedName(), EventType.M_ZK_REGION_CLOSING, 0) ); @@ -393,7 +419,7 @@ public class TestRegionServerNoMaster { try { CloseRegionRequest request = RequestConverter.buildCloseRegionRequest(earlierServerName, regionName, true); - getRS().closeRegion(null, request); + getRS().getRSRpcServices().closeRegion(null, request); Assert.fail("The closeRegion should have been rejected"); } catch (ServiceException se) { Assert.assertTrue(se.getCause() instanceof IOException); @@ -404,7 +430,7 @@ public class TestRegionServerNoMaster { closeNoZK(); try { AdminProtos.OpenRegionRequest orr = RequestConverter.buildOpenRegionRequest(earlierServerName, hri, 0, null); - getRS().openRegion(null, orr); + getRS().getRSRpcServices().openRegion(null, orr); Assert.fail("The openRegion should have been rejected"); } catch (ServiceException se) { Assert.assertTrue(se.getCause() instanceof IOException); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java Tue Mar 25 19:34:52 2014 @@ -73,11 +73,10 @@ import org.apache.hadoop.hbase.executor. import org.apache.hadoop.hbase.master.AssignmentManager; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.RegionState; -import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.master.RegionState.State; +import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext; -import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; @@ -302,6 +301,7 @@ public class TestSplitTransactionOnClust } } @Test + @SuppressWarnings("deprecation") public void testSplitFailedCompactionAndSplit() throws Exception { final byte[] tableName = Bytes.toBytes("testSplitFailedCompactionAndSplit"); Configuration conf = TESTING_UTIL.getConfiguration(); @@ -393,7 +393,7 @@ public class TestSplitTransactionOnClust // Get region pre-split. HRegionServer server = cluster.getRegionServer(tableRegionIndex); printOutRegions(server, "Initial regions: "); - int regionCount = ProtobufUtil.getOnlineRegions(server).size(); + int regionCount = ProtobufUtil.getOnlineRegions(server.getRSRpcServices()).size(); // Now, before we split, set special flag in master, a flag that has // it FAIL the processing of split. AssignmentManager.TEST_SKIP_SPLIT_HANDLING = true; @@ -466,7 +466,7 @@ public class TestSplitTransactionOnClust // Get region pre-split. HRegionServer server = cluster.getRegionServer(tableRegionIndex); printOutRegions(server, "Initial regions: "); - int regionCount = ProtobufUtil.getOnlineRegions(server).size(); + int regionCount = ProtobufUtil.getOnlineRegions(server.getRSRpcServices()).size(); // Insert into zk a blocking znode, a znode of same name as region // so it gets in way of our splitting. ServerName fakedServer = ServerName.valueOf("any.old.server", 1234, -1); @@ -480,7 +480,8 @@ public class TestSplitTransactionOnClust // Wait around a while and assert count of regions remains constant. for (int i = 0; i < 10; i++) { Thread.sleep(100); - assertEquals(regionCount, ProtobufUtil.getOnlineRegions(server).size()); + assertEquals(regionCount, ProtobufUtil.getOnlineRegions( + server.getRSRpcServices()).size()); } // Now clear the zknode ZKAssign.deleteClosingNode(TESTING_UTIL.getZooKeeperWatcher(), @@ -525,13 +526,13 @@ public class TestSplitTransactionOnClust // Get region pre-split. HRegionServer server = cluster.getRegionServer(tableRegionIndex); printOutRegions(server, "Initial regions: "); - int regionCount = ProtobufUtil.getOnlineRegions(server).size(); + int regionCount = ProtobufUtil.getOnlineRegions(server.getRSRpcServices()).size(); // Now split. split(hri, server, regionCount); // Get daughters List<HRegion> daughters = checkAndGetDaughters(tableName); // Now split one of the daughters. - regionCount = ProtobufUtil.getOnlineRegions(server).size(); + regionCount = ProtobufUtil.getOnlineRegions(server.getRSRpcServices()).size(); HRegionInfo daughter = daughters.get(0).getRegionInfo(); LOG.info("Daughter we are going to split: " + daughter); // Compact first to ensure we have cleaned up references -- else the split @@ -1169,13 +1170,14 @@ public class TestSplitTransactionOnClust private void split(final HRegionInfo hri, final HRegionServer server, final int regionCount) throws IOException, InterruptedException { this.admin.split(hri.getRegionNameAsString()); - for (int i = 0; ProtobufUtil.getOnlineRegions(server).size() <= regionCount && i < 300; i++) { + for (int i = 0; ProtobufUtil.getOnlineRegions( + server.getRSRpcServices()).size() <= regionCount && i < 300; i++) { LOG.debug("Waiting on region to split"); Thread.sleep(100); } assertFalse("Waited too long for split", - ProtobufUtil.getOnlineRegions(server).size() <= regionCount); + ProtobufUtil.getOnlineRegions(server.getRSRpcServices()).size() <= regionCount); } /** @@ -1197,8 +1199,8 @@ public class TestSplitTransactionOnClust // hbase:meta We don't want hbase:meta replay polluting our test when we later crash // the table region serving server. int metaServerIndex = cluster.getServerWithMeta(); - assertTrue(metaServerIndex != -1); - HRegionServer metaRegionServer = cluster.getRegionServer(metaServerIndex); + assertTrue(metaServerIndex == -1); // meta is on master now + HRegionServer metaRegionServer = cluster.getMaster(); int tableRegionIndex = cluster.getServerWith(hri.getRegionName()); assertTrue(tableRegionIndex != -1); HRegionServer tableRegionServer = cluster.getRegionServer(tableRegionIndex); @@ -1250,7 +1252,7 @@ public class TestSplitTransactionOnClust private void printOutRegions(final HRegionServer hrs, final String prefix) throws IOException { - List<HRegionInfo> regions = ProtobufUtil.getOnlineRegions(hrs); + List<HRegionInfo> regions = ProtobufUtil.getOnlineRegions(hrs.getRSRpcServices()); for (HRegionInfo region: regions) { LOG.info(prefix + region.getRegionNameAsString()); } Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java Tue Mar 25 19:34:52 2014 @@ -18,7 +18,7 @@ */ package org.apache.hadoop.hbase.regionserver.wal; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.io.IOException; import java.util.List; @@ -26,11 +26,9 @@ import java.util.Random; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -51,8 +49,6 @@ import com.google.protobuf.ServiceExcept @Category(MediumTests.class) public class TestHLogFiltering { - private static final Log LOG = LogFactory.getLog(TestHLogFiltering.class); - private static final int NUM_MASTERS = 1; private static final int NUM_RS = 4; @@ -124,7 +120,8 @@ public class TestHLogFiltering { RequestConverter.buildGetLastFlushedSequenceIdRequest(regionName); assertEquals((long)allFlushedSequenceIds.get(regionName), - master.getLastFlushedSequenceId(null, req).getLastFlushedSequenceId()); + master.getMasterRpcServices().getLastFlushedSequenceId( + null, req).getLastFlushedSequenceId()); } } } @@ -149,7 +146,7 @@ public class TestHLogFiltering { for (byte[] regionName : getRegionsByServer(rsId)) { FlushRegionRequest request = RequestConverter.buildFlushRegionRequest(regionName); - hrs.flushRegion(null, request); + hrs.getRSRpcServices().flushRegion(null, request); } } Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java Tue Mar 25 19:34:52 2014 @@ -187,13 +187,14 @@ public class TestAccessController extend conf.setBoolean(AccessController.EXEC_PERMISSION_CHECKS_KEY, true); TEST_UTIL.startMiniCluster(); - MasterCoprocessorHost cpHost = TEST_UTIL.getMiniHBaseCluster().getMaster().getCoprocessorHost(); + MasterCoprocessorHost cpHost = + TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterCoprocessorHost(); cpHost.load(AccessController.class, Coprocessor.PRIORITY_HIGHEST, conf); ACCESS_CONTROLLER = (AccessController) cpHost.findCoprocessor(AccessController.class.getName()); CP_ENV = cpHost.createEnvironment(AccessController.class, ACCESS_CONTROLLER, Coprocessor.PRIORITY_HIGHEST, 1, conf); RegionServerCoprocessorHost rsHost = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0) - .getCoprocessorHost(); + .getRegionServerCoprocessorHost(); RSCP_ENV = rsHost.createEnvironment(AccessController.class, ACCESS_CONTROLLER, Coprocessor.PRIORITY_HIGHEST, 1, conf); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java Tue Mar 25 19:34:52 2014 @@ -78,7 +78,7 @@ public class TestNamespaceCommands exten UTIL.waitTableAvailable(AccessControlLists.ACL_TABLE_NAME.getName(), 30 * 1000); ACCESS_CONTROLLER = (AccessController) UTIL.getMiniHBaseCluster().getMaster() - .getCoprocessorHost() + .getRegionServerCoprocessorHost() .findCoprocessor(AccessController.class.getName()); UTIL.getHBaseAdmin().createNamespace(NamespaceDescriptor.create(TestNamespace).build()); Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java?rev=1581479&r1=1581478&r2=1581479&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java Tue Mar 25 19:34:52 2014 @@ -23,19 +23,15 @@ import static org.junit.Assert.assertTru import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.HashSet; import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.PathFilter; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; @@ -57,10 +53,8 @@ import org.apache.hadoop.hbase.protobuf. import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionFileSystem; import org.apache.hadoop.hbase.regionserver.HRegionServer; -import org.apache.hadoop.hbase.snapshot.SnapshotReferenceUtil; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSTableDescriptors; -import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.FSVisitor; import org.apache.hadoop.hbase.util.MD5Hash; import org.junit.Assert; @@ -270,7 +264,7 @@ public class SnapshotTestingUtils { IsSnapshotDoneResponse done = IsSnapshotDoneResponse.newBuilder() .buildPartial(); while (!done.getDone()) { - done = master.isSnapshotDone(null, request); + done = master.getMasterRpcServices().isSnapshotDone(null, request); try { Thread.sleep(sleep); } catch (InterruptedException e) { @@ -324,7 +318,7 @@ public class SnapshotTestingUtils { IsSnapshotDoneRequest snapshot, Class<? extends HBaseSnapshotException> clazz) { try { - master.isSnapshotDone(null, snapshot); + master.getMasterRpcServices().isSnapshotDone(null, snapshot); Assert.fail("didn't fail to lookup a snapshot"); } catch (ServiceException se) { try {
