http://git-wip-us.apache.org/repos/asf/hadoop/blob/095c2696/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java index d644190..019cc52 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java @@ -580,7 +580,7 @@ public class TestOzoneRpcClient { // Second, sum the data size from chunks in Container via containerID // and localID, make sure the size equals to the size from keyDetails. Pipeline pipeline = cluster.getStorageContainerManager() - .getScmContainerManager().getContainerWithPipeline(containerID) + .getContainerManager().getContainerWithPipeline(containerID) .getPipeline(); List<DatanodeDetails> datanodes = pipeline.getMachines(); Assert.assertEquals(datanodes.size(), 1);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/095c2696/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java index 5b9bcbd..fc361b8 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java @@ -72,7 +72,6 @@ import static org.apache.hadoop.hdds .HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_SCM_WATCHER_TIMEOUT; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL; -import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL_DEFAULT; import static org.apache.hadoop.ozone .OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL; @@ -242,7 +241,7 @@ public class TestBlockDeletion { ContainerReportsProto dummyReport = dummyReportsBuilder.build(); logCapturer.clearOutput(); - scm.getScmContainerManager().processContainerReports( + scm.getContainerManager().processContainerReports( cluster.getHddsDatanodes().get(0).getDatanodeDetails(), dummyReport, false); // wait for event to be handled by event handler http://git-wip-us.apache.org/repos/asf/hadoop/blob/095c2696/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java index 8c52847..9602207 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java @@ -102,7 +102,7 @@ public class TestCloseContainerByPipeline { long containerID = omKeyLocationInfo.getContainerID(); Pipeline pipeline = cluster.getStorageContainerManager() - .getScmContainerManager().getContainerWithPipeline(containerID) + .getContainerManager().getContainerWithPipeline(containerID) .getPipeline(); List<DatanodeDetails> datanodes = pipeline.getMachines(); Assert.assertEquals(datanodes.size(), 1); @@ -157,7 +157,7 @@ public class TestCloseContainerByPipeline { long containerID = omKeyLocationInfo.getContainerID(); Pipeline pipeline = cluster.getStorageContainerManager() - .getScmContainerManager().getContainerWithPipeline(containerID) + .getContainerManager().getContainerWithPipeline(containerID) .getPipeline(); List<DatanodeDetails> datanodes = pipeline.getMachines(); Assert.assertEquals(datanodes.size(), 1); @@ -214,7 +214,7 @@ public class TestCloseContainerByPipeline { long containerID = omKeyLocationInfo.getContainerID(); Pipeline pipeline = cluster.getStorageContainerManager() - .getScmContainerManager().getContainerWithPipeline(containerID) + .getContainerManager().getContainerWithPipeline(containerID) .getPipeline(); List<DatanodeDetails> datanodes = pipeline.getMachines(); Assert.assertEquals(3, datanodes.size()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/095c2696/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java index 84b7b76..0137a40 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java @@ -81,7 +81,7 @@ public class TestCloseContainerHandler { long containerID = omKeyLocationInfo.getContainerID(); Pipeline pipeline = cluster.getStorageContainerManager() - .getScmContainerManager().getContainerWithPipeline(containerID) + .getContainerManager().getContainerWithPipeline(containerID) .getPipeline(); Assert.assertFalse(isContainerClosed(cluster, containerID)); http://git-wip-us.apache.org/repos/asf/hadoop/blob/095c2696/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java index 2a6921a..ef84b0e 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmChillMode.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleEvent; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor; import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; -import org.apache.hadoop.hdds.scm.container.ContainerMapping; +import org.apache.hadoop.hdds.scm.container.SCMContainerManager; import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerInfo; import org.apache.hadoop.hdds.scm.events.SCMEvents; import org.apache.hadoop.hdds.scm.exceptions.SCMException; @@ -128,7 +128,7 @@ public class TestScmChillMode { Map<String, OmKeyInfo> keyLocations = helper.createKeys(100, 4096); final List<ContainerInfo> containers = cluster .getStorageContainerManager() - .getScmContainerManager().getStateManager().getAllContainers(); + .getContainerManager().getStateManager().getAllContainers(); GenericTestUtils.waitFor(() -> { return containers.size() > 10; }, 100, 1000); @@ -251,7 +251,7 @@ public class TestScmChillMode { new TestStorageContainerManagerHelper(miniCluster, conf); Map<String, OmKeyInfo> keyLocations = helper.createKeys(100 * 2, 4096); final List<ContainerInfo> containers = miniCluster - .getStorageContainerManager().getScmContainerManager() + .getStorageContainerManager().getContainerManager() .getStateManager().getAllContainers(); GenericTestUtils.waitFor(() -> { return containers.size() > 10; @@ -264,8 +264,8 @@ public class TestScmChillMode { containers.remove(3); // Close remaining containers - ContainerMapping mapping = (ContainerMapping) miniCluster - .getStorageContainerManager().getScmContainerManager(); + SCMContainerManager mapping = (SCMContainerManager) miniCluster + .getStorageContainerManager().getContainerManager(); containers.forEach(c -> { try { mapping.updateContainerState(c.getContainerID(), @@ -347,7 +347,7 @@ public class TestScmChillMode { SCMClientProtocolServer clientProtocolServer = cluster .getStorageContainerManager().getClientProtocolServer(); assertFalse((scm.getClientProtocolServer()).getChillModeStatus()); - final List<ContainerInfo> containers = scm.getScmContainerManager() + final List<ContainerInfo> containers = scm.getContainerManager() .getStateManager().getAllContainers(); scm.getEventQueue().fireEvent(SCMEvents.CHILL_MODE_STATUS, true); GenericTestUtils.waitFor(() -> { http://git-wip-us.apache.org/repos/asf/hadoop/blob/095c2696/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java index 4026348..a476583 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestContainerSQLCli.java @@ -17,6 +17,8 @@ */ package org.apache.hadoop.ozone.scm; +import org.apache.hadoop.hdds.scm.container.ContainerManager; +import org.apache.hadoop.hdds.scm.container.SCMContainerManager; import org.apache.hadoop.hdds.scm.events.SCMEvents; import org.apache.hadoop.hdds.scm.node.NodeManager; import org.apache.hadoop.hdds.server.events.EventQueue; @@ -25,7 +27,6 @@ import org.apache.hadoop.ozone.OzoneConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.hdds.scm.block.BlockManagerImpl; -import org.apache.hadoop.hdds.scm.container.ContainerMapping; import org.apache.hadoop.hdds.scm.container.placement.algorithms.ContainerPlacementPolicy; import org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementCapacity; import org.apache.hadoop.hdds.scm.ScmConfigKeys; @@ -83,7 +84,7 @@ public class TestContainerSQLCli { private OzoneConfiguration conf; private String datanodeIpAddress; - private ContainerMapping mapping; + private ContainerManager containerManager; private NodeManager nodeManager; private BlockManagerImpl blockManager; @@ -119,9 +120,10 @@ public class TestContainerSQLCli { cluster.getStorageContainerManager().stop(); eventQueue = new EventQueue(); nodeManager = cluster.getStorageContainerManager().getScmNodeManager(); - mapping = new ContainerMapping(conf, nodeManager, 128, + containerManager = new SCMContainerManager(conf, nodeManager, 128, eventQueue); - blockManager = new BlockManagerImpl(conf, nodeManager, mapping, eventQueue); + blockManager = new BlockManagerImpl( + conf, nodeManager, containerManager, eventQueue); eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, blockManager); eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); GenericTestUtils.waitFor(() -> { @@ -165,7 +167,7 @@ public class TestContainerSQLCli { } blockManager.close(); - mapping.close(); + containerManager.close(); nodeManager.close(); conf.set(OzoneConfigKeys.OZONE_METADATA_STORE_IMPL, metaStoreType); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
