Repository: hadoop Updated Branches: refs/heads/trunk f760a544a -> b4031a8f1
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4031a8f/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java index 3c9e0c3..e5bb373 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestMiniOzoneCluster.java @@ -21,6 +21,7 @@ package org.apache.hadoop.ozone; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID; import org.apache.hadoop.ozone.container.common.SCMTestUtils; import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine; @@ -95,7 +96,7 @@ public class TestMiniOzoneCluster { new Pipeline(datanodeDetails.getUuidString(), HddsProtos.LifeCycleState.OPEN, HddsProtos.ReplicationType.STAND_ALONE, - HddsProtos.ReplicationFactor.ONE, "test"); + HddsProtos.ReplicationFactor.ONE, PipelineID.randomId()); pipeline.addMember(datanodeDetails); // Verify client is able to connect to the container http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4031a8f/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java index f3980a5..ff68863 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java @@ -19,6 +19,7 @@ package org.apache.hadoop.ozone.container; import com.google.common.base.Preconditions; +import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID; import org.apache.ratis.shaded.com.google.protobuf.ByteString; import org.apache.commons.codec.binary.Hex; import org.apache.hadoop.hdds.client.BlockID; @@ -136,10 +137,10 @@ public final class ContainerTestHelper { final Iterator<DatanodeDetails> i = ids.iterator(); Preconditions.checkArgument(i.hasNext()); final DatanodeDetails leader = i.next(); - String pipelineName = "TEST-" + UUID.randomUUID().toString().substring(3); final Pipeline pipeline = new Pipeline(leader.getUuidString(), LifeCycleState.OPEN, - ReplicationType.STAND_ALONE, ReplicationFactor.ONE, pipelineName); + ReplicationType.STAND_ALONE, ReplicationFactor.ONE, + PipelineID.randomId()); pipeline.addMember(leader); for(; i.hasNext();) { pipeline.addMember(i.next()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4031a8f/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 61bd935..866bc32 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 @@ -23,7 +23,7 @@ import org.apache.hadoop.hdds.client.ReplicationType; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; -import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException; +import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.OzoneConfigKeys; @@ -108,10 +108,11 @@ public class TestCloseContainerByPipeline { .get(0).getBlocksLatestVersionOnly().get(0); long containerID = omKeyLocationInfo.getContainerID(); - List<DatanodeDetails> datanodes = cluster.getStorageContainerManager() + Pipeline pipeline = cluster.getStorageContainerManager() .getScmContainerManager().getContainerWithPipeline(containerID) - .getPipeline().getMachines(); - Assert.assertTrue(datanodes.size() == 1); + .getPipeline(); + List<DatanodeDetails> datanodes = pipeline.getMachines(); + Assert.assertEquals(datanodes.size(), 1); DatanodeDetails datanodeDetails = datanodes.get(0); HddsDatanodeService datanodeService = null; @@ -131,7 +132,7 @@ public class TestCloseContainerByPipeline { cluster.getStorageContainerManager().getScmNodeManager() .addDatanodeCommand(datanodeDetails.getUuid(), new CloseContainerCommand(containerID, - HddsProtos.ReplicationType.STAND_ALONE)); + HddsProtos.ReplicationType.STAND_ALONE, pipeline.getId())); GenericTestUtils .waitFor(() -> isContainerClosed(cluster, containerID, datanodeDetails), 500, 5 * 1000); @@ -142,7 +143,7 @@ public class TestCloseContainerByPipeline { } @Test - public void testCloseContainerViaStandaAlone() + public void testCloseContainerViaStandAlone() throws IOException, TimeoutException, InterruptedException { OzoneOutputStream key = objectStore.getVolume("test").getBucket("test") @@ -163,10 +164,11 @@ public class TestCloseContainerByPipeline { .get(0).getBlocksLatestVersionOnly().get(0); long containerID = omKeyLocationInfo.getContainerID(); - List<DatanodeDetails> datanodes = cluster.getStorageContainerManager() + Pipeline pipeline = cluster.getStorageContainerManager() .getScmContainerManager().getContainerWithPipeline(containerID) - .getPipeline().getMachines(); - Assert.assertTrue(datanodes.size() == 1); + .getPipeline(); + List<DatanodeDetails> datanodes = pipeline.getMachines(); + Assert.assertEquals(datanodes.size(), 1); DatanodeDetails datanodeDetails = datanodes.get(0); Assert @@ -178,7 +180,7 @@ public class TestCloseContainerByPipeline { cluster.getStorageContainerManager().getScmNodeManager() .addDatanodeCommand(datanodeDetails.getUuid(), new CloseContainerCommand(containerID, - HddsProtos.ReplicationType.STAND_ALONE)); + HddsProtos.ReplicationType.STAND_ALONE, pipeline.getId())); GenericTestUtils .waitFor(() -> isContainerClosed(cluster, containerID, datanodeDetails), @@ -216,10 +218,11 @@ public class TestCloseContainerByPipeline { .get(0).getBlocksLatestVersionOnly().get(0); long containerID = omKeyLocationInfo.getContainerID(); - List<DatanodeDetails> datanodes = cluster.getStorageContainerManager() + Pipeline pipeline = cluster.getStorageContainerManager() .getScmContainerManager().getContainerWithPipeline(containerID) - .getPipeline().getMachines(); - Assert.assertTrue(datanodes.size() == 3); + .getPipeline(); + List<DatanodeDetails> datanodes = pipeline.getMachines(); + Assert.assertEquals(3, datanodes.size()); GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer.captureLogs(OzoneContainer.LOG); @@ -230,7 +233,7 @@ public class TestCloseContainerByPipeline { cluster.getStorageContainerManager().getScmNodeManager() .addDatanodeCommand(details.getUuid(), new CloseContainerCommand(containerID, - HddsProtos.ReplicationType.RATIS)); + HddsProtos.ReplicationType.RATIS, pipeline.getId())); } for (DatanodeDetails datanodeDetails : datanodes) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4031a8f/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 c0c9bc4..3d39dbb 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 @@ -19,6 +19,7 @@ package org.apache.hadoop.ozone.container.common.statemachine.commandhandler; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneClient; @@ -33,7 +34,6 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; import org.apache.hadoop.ozone.protocol.commands.CloseContainerCommand; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE_GB; -import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException; import org.apache.hadoop.test.GenericTestUtils; import org.junit.Assert; import org.junit.Test; @@ -80,6 +80,9 @@ public class TestCloseContainerHandler { .get(0).getBlocksLatestVersionOnly().get(0); long containerID = omKeyLocationInfo.getContainerID(); + Pipeline pipeline = cluster.getStorageContainerManager() + .getScmContainerManager().getContainerWithPipeline(containerID) + .getPipeline(); Assert.assertFalse(isContainerClosed(cluster, containerID)); @@ -89,7 +92,7 @@ public class TestCloseContainerHandler { cluster.getStorageContainerManager().getScmNodeManager() .addDatanodeCommand(datanodeDetails.getUuid(), new CloseContainerCommand(containerID, - HddsProtos.ReplicationType.STAND_ALONE)); + HddsProtos.ReplicationType.STAND_ALONE, pipeline.getId())); GenericTestUtils.waitFor(() -> isContainerClosed(cluster, containerID), 500, http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4031a8f/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkContainerStateMap.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkContainerStateMap.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkContainerStateMap.java index c344bbe..878ab36 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkContainerStateMap.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkContainerStateMap.java @@ -24,6 +24,7 @@ import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerInfo; import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline; +import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID; import org.apache.hadoop.hdds.scm.container.states.ContainerStateMap; import org.apache.hadoop.hdds.scm.exceptions.SCMException; import org.apache.hadoop.util.Time; @@ -60,7 +61,7 @@ public class BenchMarkContainerStateMap { try { ContainerInfo containerInfo = new ContainerInfo.Builder() .setState(CLOSED) - .setPipelineName(pipeline.getPipelineName()) + .setPipelineID(pipeline.getId()) .setReplicationType(pipeline.getType()) .setReplicationFactor(pipeline.getFactor()) // This is bytes allocated for blocks inside container, not the @@ -83,7 +84,7 @@ public class BenchMarkContainerStateMap { try { ContainerInfo containerInfo = new ContainerInfo.Builder() .setState(OPEN) - .setPipelineName(pipeline.getPipelineName()) + .setPipelineID(pipeline.getId()) .setReplicationType(pipeline.getType()) .setReplicationFactor(pipeline.getFactor()) // This is bytes allocated for blocks inside container, not the @@ -105,7 +106,7 @@ public class BenchMarkContainerStateMap { try { ContainerInfo containerInfo = new ContainerInfo.Builder() .setState(OPEN) - .setPipelineName(pipeline.getPipelineName()) + .setPipelineID(pipeline.getId()) .setReplicationType(pipeline.getType()) .setReplicationFactor(pipeline.getFactor()) // This is bytes allocated for blocks inside container, not the @@ -154,10 +155,10 @@ public class BenchMarkContainerStateMap { final Iterator<DatanodeDetails> i = ids.iterator(); Preconditions.checkArgument(i.hasNext()); final DatanodeDetails leader = i.next(); - String pipelineName = "TEST-" + UUID.randomUUID().toString().substring(5); final Pipeline pipeline = new Pipeline(leader.getUuidString(), OPEN, - ReplicationType.STAND_ALONE, ReplicationFactor.ONE, pipelineName); + ReplicationType.STAND_ALONE, ReplicationFactor.ONE, + PipelineID.randomId()); pipeline.addMember(leader); for (; i.hasNext();) { pipeline.addMember(i.next()); @@ -172,7 +173,7 @@ public class BenchMarkContainerStateMap { int cid = state.containerID.incrementAndGet(); ContainerInfo containerInfo = new ContainerInfo.Builder() .setState(CLOSED) - .setPipelineName(pipeline.getPipelineName()) + .setPipelineID(pipeline.getId()) .setReplicationType(pipeline.getType()) .setReplicationFactor(pipeline.getFactor()) // This is bytes allocated for blocks inside container, not the http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4031a8f/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java index 3c49fb6..77be57d 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java @@ -18,6 +18,7 @@ package org.apache.hadoop.ozone.genesis; import org.apache.hadoop.hdds.scm.container.common.helpers.Pipeline; +import org.apache.hadoop.hdds.scm.container.common.helpers.PipelineID; import org.apache.hadoop.ozone.container.common.impl.ContainerSet; import org.apache.hadoop.ozone.container.common.impl.HddsDispatcher; import org.apache.hadoop.ozone.container.common.statemachine @@ -92,7 +93,7 @@ public class BenchMarkDatanodeDispatcher { datanodeUuid = UUID.randomUUID().toString(); pipeline = new Pipeline("127.0.0.1", LifeCycleState.OPEN, ReplicationType.STAND_ALONE, - ReplicationFactor.ONE, "SA-" + UUID.randomUUID()); + ReplicationFactor.ONE, PipelineID.randomId()); // 1 MB of data data = ByteString.copyFromUtf8(RandomStringUtils.randomAscii(1048576)); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4031a8f/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 7603842..bb0e48b 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -97,7 +97,7 @@ <ldap-api.version>1.0.0-M33</ldap-api.version> <!-- Apache Ratis version --> - <ratis.version>0.3.0-c242317-SNAPSHOT</ratis.version> + <ratis.version>0.3.0-e4a016f-SNAPSHOT</ratis.version> <jcache.version>1.0-alpha-1</jcache.version> <ehcache.version>3.3.1</ehcache.version> <hikari.version>2.4.12</hikari.version> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
