HDDS-6135. SCM Container DB bootstrap on Recon startup for SCM HA. #2972
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.ozone.recon; | ||
|
|
||
| import org.apache.hadoop.hdds.client.RatisReplicationConfig; | ||
| import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
| import org.apache.hadoop.hdds.protocol.proto.HddsProtos; | ||
| import org.apache.hadoop.hdds.scm.ScmConfigKeys; | ||
| import org.apache.hadoop.hdds.scm.container.ContainerInfo; | ||
| import org.apache.hadoop.hdds.scm.container.ContainerManager; | ||
| import org.apache.hadoop.hdds.scm.pipeline.PipelineManager; | ||
| import org.apache.hadoop.ozone.MiniOzoneCluster; | ||
| import org.apache.hadoop.ozone.recon.scm.ReconNodeManager; | ||
| import org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade; | ||
| import org.apache.ozone.test.GenericTestUtils; | ||
| import org.junit.AfterClass; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.Timeout; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_HA_ENABLE_KEY; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| /** | ||
| * Test Recon SCM HA Snapshot Download implementation. | ||
| */ | ||
| public class TestReconScmHASnapshot { | ||
|
|
||
| /** | ||
| * Set a timeout for each test. | ||
| */ | ||
| @Rule | ||
| public Timeout timeout = Timeout.seconds(100); | ||
| private static OzoneConfiguration conf; | ||
| private static MiniOzoneCluster cluster; | ||
|
|
||
| @BeforeClass | ||
| public static void setup() throws Exception { | ||
| conf = new OzoneConfiguration(); | ||
| conf.setBoolean(OZONE_SCM_HA_ENABLE_KEY, true); | ||
| conf.setBoolean( | ||
| ReconServerConfigKeys.OZONE_RECON_SCM_SNAPSHOT_ENABLED, true); | ||
| conf.setInt(ReconServerConfigKeys.OZONE_RECON_SCM_CONTAINER_THRESHOLD, 0); | ||
| conf.setInt(ScmConfigKeys.OZONE_DATANODE_PIPELINE_LIMIT, 5); | ||
| cluster = MiniOzoneCluster.newBuilder(conf) | ||
| .setNumDatanodes(4) | ||
| .includeRecon(true) | ||
| .build(); | ||
| cluster.waitForClusterToBeReady(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testScmHASnapshot() throws Exception { | ||
| GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer | ||
| .captureLogs(LoggerFactory.getLogger( | ||
| ReconStorageContainerManagerFacade.class)); | ||
|
|
||
| List<ContainerInfo> reconContainers = cluster.getReconServer() | ||
| .getReconStorageContainerManager().getContainerManager() | ||
| .getContainers(); | ||
| assertEquals(0, reconContainers.size()); | ||
|
|
||
| ReconNodeManager nodeManager; | ||
| nodeManager = (ReconNodeManager) cluster.getReconServer() | ||
| .getReconStorageContainerManager().getScmNodeManager(); | ||
| long keyCountBefore = nodeManager.getNodeDBKeyCount(); | ||
|
|
||
| //Stopping Recon to add Containers in SCM | ||
| cluster.stopRecon(); | ||
|
|
||
| ContainerManager containerManager; | ||
| containerManager = cluster.getStorageContainerManager() | ||
| .getContainerManager(); | ||
|
|
||
| for (int i = 0; i < 10; i++) { | ||
| containerManager.allocateContainer(new RatisReplicationConfig( | ||
| HddsProtos.ReplicationFactor.ONE), "testOwner"); | ||
| } | ||
|
|
||
| cluster.startRecon(); | ||
|
|
||
| //ContainerCount after Recon DB is updated with SCM DB | ||
| containerManager = cluster.getStorageContainerManager() | ||
| .getContainerManager(); | ||
| ContainerManager reconContainerManager = cluster.getReconServer() | ||
| .getReconStorageContainerManager().getContainerManager(); | ||
| assertTrue(logCapturer.getOutput() | ||
| .contains("Downloaded SCM Snapshot from Leader SCM")); | ||
| assertTrue(logCapturer.getOutput() | ||
| .contains("Recon Container Count: " + reconContainers.size() + | ||
| ", SCM Container Count: " + containerManager.getContainers().size())); | ||
| assertEquals(containerManager.getContainers().size(), | ||
| reconContainerManager.getContainers().size()); | ||
|
|
||
| //PipelineCount after Recon DB is updated with SCM DB | ||
| PipelineManager scmPipelineManager = cluster.getStorageContainerManager() | ||
| .getPipelineManager(); | ||
| PipelineManager reconPipelineManager = cluster.getReconServer() | ||
| .getReconStorageContainerManager().getPipelineManager(); | ||
| assertEquals(scmPipelineManager.getPipelines().size(), | ||
| reconPipelineManager.getPipelines().size()); | ||
|
|
||
| //NodeCount after Recon DB updated with SCM DB | ||
| nodeManager = (ReconNodeManager) cluster.getReconServer() | ||
| .getReconStorageContainerManager().getScmNodeManager(); | ||
| long keyCountAfter = nodeManager.getNodeDBKeyCount(); | ||
| assertEquals(keyCountAfter, keyCountBefore); | ||
|
Contributor
There was a problem hiding this comment. Can we extract this into a common assertion function shared between the HA and non HA variants of this test? |
||
| } | ||
|
|
||
| @AfterClass | ||
| public static void shutdown() throws Exception { | ||
| if (cluster != null) { | ||
| cluster.shutdown(); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.ozone.recon; | ||
|
|
||
| import org.apache.hadoop.hdds.client.RatisReplicationConfig; | ||
| import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
| import org.apache.hadoop.hdds.protocol.proto.HddsProtos; | ||
| import org.apache.hadoop.hdds.scm.container.ContainerInfo; | ||
| import org.apache.hadoop.hdds.scm.container.ContainerManager; | ||
| import org.apache.hadoop.hdds.scm.pipeline.PipelineManager; | ||
| import org.apache.hadoop.ozone.MiniOzoneCluster; | ||
| import org.apache.hadoop.ozone.recon.scm.ReconNodeManager; | ||
| import org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade; | ||
| import org.apache.ozone.test.GenericTestUtils; | ||
| import org.junit.AfterClass; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.Timeout; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| /** | ||
| * Test Recon SCM Snapshot Download implementation. | ||
| */ | ||
| public class TestReconScmSnapshot { | ||
| /** | ||
| * Set a timeout for each test. | ||
| */ | ||
| @Rule | ||
| public Timeout timeout = Timeout.seconds(100); | ||
| private static OzoneConfiguration conf; | ||
| private static MiniOzoneCluster cluster; | ||
|
|
||
| @BeforeClass | ||
| public static void setup() throws Exception { | ||
| conf = new OzoneConfiguration(); | ||
| conf.setBoolean( | ||
| ReconServerConfigKeys.OZONE_RECON_SCM_SNAPSHOT_ENABLED, true); | ||
| conf.setInt(ReconServerConfigKeys.OZONE_RECON_SCM_CONTAINER_THRESHOLD, 0); | ||
| cluster = MiniOzoneCluster.newBuilder(conf) | ||
| .setNumDatanodes(4) | ||
| .includeRecon(true) | ||
| .build(); | ||
| cluster.waitForClusterToBeReady(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testScmSnapshot() throws Exception { | ||
| GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer | ||
| .captureLogs(LoggerFactory.getLogger( | ||
| ReconStorageContainerManagerFacade.class)); | ||
|
|
||
| List<ContainerInfo> reconContainers = cluster.getReconServer() | ||
| .getReconStorageContainerManager().getContainerManager() | ||
| .getContainers(); | ||
| assertEquals(0, reconContainers.size()); | ||
|
|
||
| ReconNodeManager nodeManager; | ||
| nodeManager = (ReconNodeManager) cluster.getReconServer() | ||
| .getReconStorageContainerManager().getScmNodeManager(); | ||
| long keyCountBefore = nodeManager.getNodeDBKeyCount(); | ||
|
|
||
| //Stopping Recon to add Containers in SCM | ||
| cluster.stopRecon(); | ||
|
|
||
| ContainerManager containerManager; | ||
| containerManager = cluster.getStorageContainerManager() | ||
| .getContainerManager(); | ||
|
|
||
| for (int i = 0; i < 10; i++) { | ||
| containerManager.allocateContainer(new RatisReplicationConfig( | ||
| HddsProtos.ReplicationFactor.ONE), "testOwner"); | ||
| } | ||
|
|
||
| cluster.startRecon(); | ||
|
|
||
| //ContainerCount after Recon DB is updated with SCM DB | ||
| containerManager = cluster.getStorageContainerManager() | ||
| .getContainerManager(); | ||
| ContainerManager reconContainerManager = cluster.getReconServer() | ||
| .getReconStorageContainerManager().getContainerManager(); | ||
| assertTrue(logCapturer.getOutput() | ||
| .contains("Recon Container Count: " + reconContainers.size() + | ||
| ", SCM Container Count: " + containerManager.getContainers().size())); | ||
| assertEquals(containerManager.getContainers().size(), | ||
| reconContainerManager.getContainers().size()); | ||
|
|
||
| //PipelineCount after Recon DB is updated with SCM DB | ||
| PipelineManager scmPipelineManager = cluster.getStorageContainerManager() | ||
| .getPipelineManager(); | ||
| PipelineManager reconPipelineManager = cluster.getReconServer() | ||
| .getReconStorageContainerManager().getPipelineManager(); | ||
| assertEquals(scmPipelineManager.getPipelines().size(), | ||
| reconPipelineManager.getPipelines().size()); | ||
|
|
||
| //NodeCount after Recon DB updated with SCM DB | ||
| nodeManager = (ReconNodeManager) cluster.getReconServer() | ||
| .getReconStorageContainerManager().getScmNodeManager(); | ||
| long keyCountAfter = nodeManager.getNodeDBKeyCount(); | ||
| assertEquals(keyCountAfter, keyCountBefore); | ||
| } | ||
|
|
||
| @AfterClass | ||
| public static void shutdown() throws Exception { | ||
| if (cluster != null) { | ||
| cluster.shutdown(); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we move this to a common initializer function shared between the
TestReconScmHASnapshot.javaandTestReconScmSnapshot.java, it will help reduce code duplication across the two files.