http://git-wip-us.apache.org/repos/asf/hadoop/blob/18fe65d7/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 aada723..30e3536 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,6 +23,7 @@ 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.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import org.apache.hadoop.ozone.HddsDatanodeService; import org.apache.hadoop.ozone.MiniOzoneCluster; @@ -102,10 +103,10 @@ public class TestCloseContainerByPipeline { .get(0).getBlocksLatestVersionOnly().get(0); long containerID = omKeyLocationInfo.getContainerID(); + ContainerInfo container = cluster.getStorageContainerManager() + .getContainerManager().getContainer(ContainerID.valueof(containerID)); Pipeline pipeline = cluster.getStorageContainerManager() - .getContainerManager().getContainerWithPipeline( - ContainerID.valueof(containerID)) - .getPipeline(); + .getPipelineManager().getPipeline(container.getPipelineID()); List<DatanodeDetails> datanodes = pipeline.getNodes(); Assert.assertEquals(datanodes.size(), 1); @@ -158,10 +159,10 @@ public class TestCloseContainerByPipeline { .get(0).getBlocksLatestVersionOnly().get(0); long containerID = omKeyLocationInfo.getContainerID(); + ContainerInfo container = cluster.getStorageContainerManager() + .getContainerManager().getContainer(ContainerID.valueof(containerID)); Pipeline pipeline = cluster.getStorageContainerManager() - .getContainerManager().getContainerWithPipeline( - ContainerID.valueof(containerID)) - .getPipeline(); + .getPipelineManager().getPipeline(container.getPipelineID()); List<DatanodeDetails> datanodes = pipeline.getNodes(); Assert.assertEquals(datanodes.size(), 1); @@ -216,10 +217,10 @@ public class TestCloseContainerByPipeline { .get(0).getBlocksLatestVersionOnly().get(0); long containerID = omKeyLocationInfo.getContainerID(); + ContainerInfo container = cluster.getStorageContainerManager() + .getContainerManager().getContainer(ContainerID.valueof(containerID)); Pipeline pipeline = cluster.getStorageContainerManager() - .getContainerManager().getContainerWithPipeline( - ContainerID.valueof(containerID)) - .getPipeline(); + .getPipelineManager().getPipeline(container.getPipelineID()); List<DatanodeDetails> datanodes = pipeline.getNodes(); Assert.assertEquals(3, datanodes.size());
http://git-wip-us.apache.org/repos/asf/hadoop/blob/18fe65d7/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 f3ce899..9cf51d1 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 @@ -20,6 +20,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.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.client.ObjectStore; @@ -80,28 +81,30 @@ public class TestCloseContainerHandler { cluster.getOzoneManager().lookupKey(keyArgs).getKeyLocationVersions() .get(0).getBlocksLatestVersionOnly().get(0); - long containerID = omKeyLocationInfo.getContainerID(); + ContainerID containerId = ContainerID.valueof( + omKeyLocationInfo.getContainerID()); + ContainerInfo container = cluster.getStorageContainerManager() + .getContainerManager().getContainer(containerId); Pipeline pipeline = cluster.getStorageContainerManager() - .getContainerManager().getContainerWithPipeline( - ContainerID.valueof(containerID)) - .getPipeline(); + .getPipelineManager().getPipeline(container.getPipelineID()); - Assert.assertFalse(isContainerClosed(cluster, containerID)); + Assert.assertFalse(isContainerClosed(cluster, containerId.getId())); DatanodeDetails datanodeDetails = cluster.getHddsDatanodes().get(0).getDatanodeDetails(); //send the order to close the container cluster.getStorageContainerManager().getScmNodeManager() .addDatanodeCommand(datanodeDetails.getUuid(), - new CloseContainerCommand(containerID, + new CloseContainerCommand(containerId.getId(), HddsProtos.ReplicationType.STAND_ALONE, pipeline.getId())); - GenericTestUtils.waitFor(() -> isContainerClosed(cluster, containerID), + GenericTestUtils.waitFor(() -> + isContainerClosed(cluster, containerId.getId()), 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - Assert.assertTrue(isContainerClosed(cluster, containerID)); + Assert.assertTrue(isContainerClosed(cluster, containerId.getId())); } private Boolean isContainerClosed(MiniOzoneCluster cluster, http://git-wip-us.apache.org/repos/asf/hadoop/blob/18fe65d7/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java index 44f6f1d..149d65e 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeFastRestart.java @@ -97,6 +97,14 @@ public class TestFreonWithDatanodeFastRestart { TermIndex termIndexAfterRestart = sm.getLastAppliedTermIndex(); Assert.assertTrue(termIndexAfterRestart.getIndex() >= termIndexBeforeRestart.getIndex()); + // TODO: fix me + // Give some time for the datanode to register again with SCM. + // If we try to use the pipeline before the datanode registers with SCM + // we end up in "NullPointerException: scmId cannot be null" in + // datanode statemachine and datanode crashes. + // This has to be fixed. Check HDDS-830. + // Until then this sleep should help us! + Thread.sleep(5000); startFreon(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/18fe65d7/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java index 7cb53d3..4c54e9f 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/TestFreonWithDatanodeRestart.java @@ -26,6 +26,7 @@ import org.apache.hadoop.ozone.MiniOzoneCluster; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import java.util.concurrent.TimeUnit; @@ -77,6 +78,10 @@ public class TestFreonWithDatanodeRestart { } } + @Ignore + // Pipeline close is not happening now, this requires HDDS-801 and + // pipeline teardown logic in place. Enable this once those things are in + // place @Test public void testRestart() throws Exception { startFreon(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/18fe65d7/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 3247b87..e883667 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 @@ -128,7 +128,7 @@ public class TestContainerSQLCli { containerManager = new SCMContainerManager(conf, nodeManager, pipelineManager, eventQueue); blockManager = new BlockManagerImpl( - conf, nodeManager, containerManager, eventQueue); + conf, nodeManager, pipelineManager, containerManager, eventQueue); eventQueue.addHandler(SCMEvents.CHILL_MODE_STATUS, blockManager); eventQueue.fireEvent(SCMEvents.CHILL_MODE_STATUS, false); GenericTestUtils.waitFor(() -> { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
