http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java index cc0a123..6981415 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java @@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.UnknownRegionException; -import org.apache.hadoop.hbase.catalog.MetaReader; +import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -174,14 +174,14 @@ public class TestRegionMergeTransactionOnCluster { verifyRowCount(table, ROWSIZE); table.close(); - List<Pair<HRegionInfo, ServerName>> tableRegions = MetaReader - .getTableRegionsAndLocations(master.getCatalogTracker(), - tableName); + List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor + .getTableRegionsAndLocations(master.getZooKeeper(), + master.getShortCircuitConnection(), tableName); HRegionInfo mergedRegionInfo = tableRegions.get(0).getFirst(); HTableDescriptor tableDescritor = master.getTableDescriptors().get( tableName); - Result mergedRegionResult = MetaReader.getRegionResult( - master.getCatalogTracker(), mergedRegionInfo.getRegionName()); + Result mergedRegionResult = MetaTableAccessor.getRegionResult( + master.getShortCircuitConnection(), mergedRegionInfo.getRegionName()); // contains merge reference in META assertTrue(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY, @@ -223,8 +223,8 @@ public class TestRegionMergeTransactionOnCluster { assertFalse(fs.exists(regionAdir)); assertFalse(fs.exists(regionBdir)); - mergedRegionResult = MetaReader.getRegionResult( - master.getCatalogTracker(), mergedRegionInfo.getRegionName()); + mergedRegionResult = MetaTableAccessor.getRegionResult( + master.getShortCircuitConnection(), mergedRegionInfo.getRegionName()); assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY, HConstants.MERGEA_QUALIFIER) != null); assertFalse(mergedRegionResult.getValue(HConstants.CATALOG_FAMILY, @@ -299,9 +299,9 @@ public class TestRegionMergeTransactionOnCluster { private PairOfSameType<HRegionInfo> requestMergeRegion( HMaster master, TableName tablename, int regionAnum, int regionBnum) throws Exception { - List<Pair<HRegionInfo, ServerName>> tableRegions = MetaReader - .getTableRegionsAndLocations(master.getCatalogTracker(), - tablename); + List<Pair<HRegionInfo, ServerName>> tableRegions = MetaTableAccessor + .getTableRegionsAndLocations(master.getZooKeeper(), + master.getShortCircuitConnection(), tablename); HRegionInfo regionA = tableRegions.get(regionAnum).getFirst(); HRegionInfo regionB = tableRegions.get(regionBnum).getFirst(); TEST_UTIL.getHBaseAdmin().mergeRegions( @@ -316,8 +316,8 @@ public class TestRegionMergeTransactionOnCluster { List<HRegionInfo> tableRegionsInMaster; long timeout = System.currentTimeMillis() + waitTime; while (System.currentTimeMillis() < timeout) { - tableRegionsInMeta = MetaReader.getTableRegionsAndLocations( - master.getCatalogTracker(), tablename); + tableRegionsInMeta = MetaTableAccessor.getTableRegionsAndLocations( + master.getZooKeeper(), master.getShortCircuitConnection(), tablename); tableRegionsInMaster = master.getAssignmentManager().getRegionStates() .getRegionsOfTable(tablename); if (tableRegionsInMeta.size() == expectedRegionNum @@ -327,8 +327,8 @@ public class TestRegionMergeTransactionOnCluster { Thread.sleep(250); } - tableRegionsInMeta = MetaReader.getTableRegionsAndLocations( - master.getCatalogTracker(), tablename); + tableRegionsInMeta = MetaTableAccessor.getTableRegionsAndLocations( + master.getZooKeeper(), master.getShortCircuitConnection(), tablename); LOG.info("Regions after merge:" + Joiner.on(',').join(tableRegionsInMeta)); assertEquals(expectedRegionNum, tableRegionsInMeta.size()); } @@ -354,15 +354,15 @@ public class TestRegionMergeTransactionOnCluster { long timeout = System.currentTimeMillis() + waitTime; List<Pair<HRegionInfo, ServerName>> tableRegions; while (System.currentTimeMillis() < timeout) { - tableRegions = MetaReader.getTableRegionsAndLocations( - master.getCatalogTracker(), tablename); + tableRegions = MetaTableAccessor.getTableRegionsAndLocations( + master.getZooKeeper(), master.getShortCircuitConnection(), tablename); if (tableRegions.size() == numRegions) break; Thread.sleep(250); } - tableRegions = MetaReader.getTableRegionsAndLocations( - master.getCatalogTracker(), tablename); + tableRegions = MetaTableAccessor.getTableRegionsAndLocations( + master.getZooKeeper(), master.getShortCircuitConnection(), tablename); LOG.info("Regions after load: " + Joiner.on(',').join(tableRegions)); assertEquals(numRegions, tableRegions.size()); return table;
http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java index 59dc612..9f64a7c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.catalog.TestMetaReaderEditor; +import org.apache.hadoop.hbase.TestMetaTableAccessor; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -184,8 +184,8 @@ public class TestRegionReplicas { HTable meta = null; try { meta = new HTable(HTU.getConfiguration(), TableName.META_TABLE_NAME); - TestMetaReaderEditor.assertMetaLocation(meta, hriPrimary.getRegionName() - , getRS().getServerName(), -1, 1, false); + TestMetaTableAccessor.assertMetaLocation(meta, hriPrimary.getRegionName() + , getRS().getServerName(), -1, 1, false); } finally { if (meta != null ) meta.close(); closeRegion(hriSecondary); http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java index 4aee585..0843abe 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hbase.HTableDescriptor; 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.MetaTableAccessor; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.coordination.BaseCoordinatedStateManager; @@ -43,7 +43,7 @@ import org.apache.hadoop.hbase.regionserver.handler.OpenRegionHandler; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; -import org.apache.hadoop.hbase.zookeeper.MetaRegionTracker; +import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKAssign; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.zookeeper.KeeperException; @@ -111,8 +111,9 @@ public class TestRegionServerNoMaster { zkw, HRegionInfo.FIRST_META_REGIONINFO, hrs.getServerName()); ProtobufUtil.openRegion(hrs.getRSRpcServices(), hrs.getServerName(), HRegionInfo.FIRST_META_REGIONINFO); + MetaTableLocator mtl = new MetaTableLocator(); while (true) { - ServerName sn = MetaRegionTracker.getMetaRegionLocation(zkw); + ServerName sn = mtl.getMetaRegionLocation(zkw); if (sn != null && sn.equals(hrs.getServerName())) { break; } @@ -301,7 +302,7 @@ public class TestRegionServerNoMaster { try { // we re-opened meta so some of its data is lost ServerName sn = getRS().getServerName(); - MetaEditor.updateRegionLocation(getRS().catalogTracker, + MetaTableAccessor.updateRegionLocation(getRS().getShortCircuitConnection(), hri, sn, getRS().getRegion(regionName).getOpenSeqNum()); // fake region to be closing now, need to clear state afterwards getRS().regionsInTransitionInRS.put(hri.getEncodedNameAsBytes(), Boolean.FALSE); http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/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 b4a780f..b7626e9 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 @@ -56,8 +56,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.UnknownRegionException; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.ZooKeeperConnectionException; -import org.apache.hadoop.hbase.catalog.MetaEditor; -import org.apache.hadoop.hbase.catalog.MetaReader; +import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -898,8 +897,8 @@ public class TestSplitTransactionOnCluster { admin.setBalancerRunning(false, true); // Turn off the meta scanner so it don't remove parent on us. cluster.getMaster().setCatalogJanitorEnabled(false); - boolean tableExists = MetaReader.tableExists(regionServer.getCatalogTracker(), - tableName); + boolean tableExists = MetaTableAccessor.tableExists(regionServer.getShortCircuitConnection(), + tableName); assertEquals("The specified table should present.", true, tableExists); final HRegion region = findSplittableRegion(regions); assertTrue("not able to find a splittable region", region != null); @@ -910,8 +909,8 @@ public class TestSplitTransactionOnCluster { } catch (IOException e) { } - tableExists = MetaReader.tableExists(regionServer.getCatalogTracker(), - tableName); + tableExists = MetaTableAccessor.tableExists(regionServer.getShortCircuitConnection(), + tableName); assertEquals("The specified table should present.", true, tableExists); } finally { if (regions != null) { @@ -1420,13 +1419,15 @@ public class TestSplitTransactionOnCluster { copyOfParent.setOffline(true); copyOfParent.setSplit(true); // Put for parent - Put putParent = MetaEditor.makePutFromRegionInfo(copyOfParent); - MetaEditor.addDaughtersToPut(putParent, daughterRegions.getFirst().getRegionInfo(), + Put putParent = MetaTableAccessor.makePutFromRegionInfo(copyOfParent); + MetaTableAccessor.addDaughtersToPut(putParent, daughterRegions.getFirst().getRegionInfo(), daughterRegions.getSecond().getRegionInfo()); metaEntries.add(putParent); // Puts for daughters - Put putA = MetaEditor.makePutFromRegionInfo(daughterRegions.getFirst().getRegionInfo()); - Put putB = MetaEditor.makePutFromRegionInfo(daughterRegions.getSecond().getRegionInfo()); + Put putA = MetaTableAccessor.makePutFromRegionInfo( + daughterRegions.getFirst().getRegionInfo()); + Put putB = MetaTableAccessor.makePutFromRegionInfo( + daughterRegions.getSecond().getRegionInfo()); st.addLocation(putA, rs.getServerName(), 1); st.addLocation(putB, rs.getServerName(), 1); metaEntries.add(putA); http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java index 843f2c6..f0412e1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java @@ -30,7 +30,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -148,7 +149,12 @@ public class TestReplicationStateZKImpl extends TestReplicationStateBasic { } @Override - public CatalogTracker getCatalogTracker() { + public HConnection getShortCircuitConnection() { + return null; + } + + @Override + public MetaTableLocator getMetaTableLocator() { return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java index e6a26e7..5273fe3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java @@ -31,8 +31,9 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.CoordinatedStateManager; +import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -224,7 +225,12 @@ public class TestReplicationTrackerZKImpl { } @Override - public CatalogTracker getCatalogTracker() { + public HConnection getShortCircuitConnection() { + return null; + } + + @Override + public MetaTableLocator getMetaTableLocator() { return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java index a0133a8..09fa096 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java @@ -47,8 +47,8 @@ import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.CoordinatedStateManager; +import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; @@ -60,6 +60,7 @@ import org.apache.hadoop.hbase.replication.ReplicationQueues; import org.apache.hadoop.hbase.replication.ReplicationSourceDummy; import org.apache.hadoop.hbase.replication.ReplicationStateZKBase; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -395,10 +396,14 @@ public class TestReplicationSourceManager { public CoordinatedStateManager getCoordinatedStateManager() { return null; } + @Override + public HConnection getShortCircuitConnection() { + return null; + } @Override - public CatalogTracker getCatalogTracker() { - return null; // To change body of implemented methods use File | Settings | File Templates. + public MetaTableLocator getMetaTableLocator() { + return null; } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java index e38f659..8f8d92d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java @@ -42,7 +42,7 @@ import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.ipc.BlockingRpcCallback; @@ -64,6 +64,7 @@ import org.apache.hadoop.hbase.util.Sleeper; import org.apache.hadoop.hbase.util.Strings; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.util.Writables; +import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.net.DNS; @@ -144,7 +145,12 @@ public class TestTokenAuthentication { } @Override - public CatalogTracker getCatalogTracker() { + public HConnection getShortCircuitConnection() { + return null; + } + + @Override + public MetaTableLocator getMetaTableLocator() { return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java index 040a466..7963665 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java @@ -31,7 +31,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.catalog.CatalogTracker; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.apache.hadoop.hbase.io.HFileLink; import org.apache.hadoop.hbase.monitoring.MonitoredTask; @@ -147,8 +146,6 @@ public class TestRestoreSnapshotHelper { */ private RestoreSnapshotHelper getRestoreHelper(final Path rootDir, final Path snapshotDir, final SnapshotDescription sd, final HTableDescriptor htdClone) throws IOException { - CatalogTracker catalogTracker = Mockito.mock(CatalogTracker.class); - HTableDescriptor tableDescriptor = Mockito.mock(HTableDescriptor.class); ForeignExceptionDispatcher monitor = Mockito.mock(ForeignExceptionDispatcher.class); MonitoredTask status = Mockito.mock(MonitoredTask.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java index 572d130..ca83eb2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java @@ -27,7 +27,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ZooKeeperConnectionException; -import org.apache.hadoop.hbase.catalog.CatalogTracker; +import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; /** @@ -101,7 +102,12 @@ public class MockServer implements Server { } @Override - public CatalogTracker getCatalogTracker() { + public HConnection getShortCircuitConnection() { + return null; + } + + @Override + public MetaTableLocator getMetaTableLocator() { return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java index b235256..3926442 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java @@ -61,7 +61,7 @@ import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.catalog.MetaEditor; +import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Get; @@ -93,7 +93,7 @@ import org.apache.hadoop.hbase.util.HBaseFsck.PrintingErrorReporter; import org.apache.hadoop.hbase.util.HBaseFsck.TableInfo; import org.apache.hadoop.hbase.util.hbck.HFileCorruptionChecker; import org.apache.hadoop.hbase.util.hbck.HbckTestingUtil; -import org.apache.hadoop.hbase.zookeeper.MetaRegionTracker; +import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.zookeeper.KeeperException; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -226,7 +226,7 @@ public class TestHBaseFsck { } } regionStates.regionOffline(HRegionInfo.FIRST_META_REGIONINFO); - MetaRegionTracker.deleteMetaLocation(cluster.getMaster().getZooKeeper()); + new MetaTableLocator().deleteMetaLocation(cluster.getMaster().getZooKeeper()); assertFalse(regionStates.isRegionOnline(HRegionInfo.FIRST_META_REGIONINFO)); HBaseFsck hbck = doFsck(conf, true); assertErrors(hbck, new ERROR_CODE[] { ERROR_CODE.UNKNOWN, ERROR_CODE.NO_META_REGION, @@ -242,7 +242,7 @@ public class TestHBaseFsck { throws IOException { HTable meta = new HTable(conf, TableName.META_TABLE_NAME, executorService); HRegionInfo hri = new HRegionInfo(htd.getTableName(), startKey, endKey); - MetaEditor.addRegionToMeta(meta, hri); + MetaTableAccessor.addRegionToMeta(meta, hri); meta.close(); return hri; } @@ -1321,7 +1321,7 @@ public class TestHBaseFsck { hri.setOffline(true); hri.setSplit(true); - MetaEditor.addRegionToMeta(meta, hri, a, b); + MetaTableAccessor.addRegionToMeta(meta, hri, a, b); meta.flushCommits(); TEST_UTIL.getHBaseAdmin().flush(TableName.META_TABLE_NAME.getName()); http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java index c2e7ef1..96a9c33 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java @@ -29,9 +29,10 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.*; -import org.apache.hadoop.hbase.catalog.CatalogTracker; -import org.apache.hadoop.hbase.catalog.MetaReader; +import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.client.HConnectionManager; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.regionserver.HRegion; @@ -111,17 +112,19 @@ public class TestMergeTable { LOG.info("Starting mini hbase cluster"); UTIL.startMiniHBaseCluster(1, 1); Configuration c = new Configuration(UTIL.getConfiguration()); - CatalogTracker ct = new CatalogTracker(c); - ct.start(); + HConnection hConnection = HConnectionManager.getConnection(c); + List<HRegionInfo> originalTableRegions = - MetaReader.getTableRegions(ct, desc.getTableName()); + MetaTableAccessor.getTableRegions(UTIL.getZooKeeperWatcher(), hConnection, + desc.getTableName()); LOG.info("originalTableRegions size=" + originalTableRegions.size() + "; " + originalTableRegions); HBaseAdmin admin = new HBaseAdmin(c); admin.disableTable(desc.getTableName()); HMerge.merge(c, FileSystem.get(c), desc.getTableName()); List<HRegionInfo> postMergeTableRegions = - MetaReader.getTableRegions(ct, desc.getTableName()); + MetaTableAccessor.getTableRegions(UTIL.getZooKeeperWatcher(), hConnection, + desc.getTableName()); LOG.info("postMergeTableRegions size=" + postMergeTableRegions.size() + "; " + postMergeTableRegions); assertTrue("originalTableRegions=" + originalTableRegions.size() + http://git-wip-us.apache.org/repos/asf/hbase/blob/ea085c63/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java index 4a5f84d..6d08267 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java @@ -39,7 +39,7 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.catalog.MetaEditor; +import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HConnectionManager; @@ -220,7 +220,7 @@ public class OfflineMetaRebuildTestCore { out.close(); // add to meta. - MetaEditor.addRegionToMeta(meta, hri); + MetaTableAccessor.addRegionToMeta(meta, hri); meta.close(); return hri; }
