Skip to content

HDDS-12387. Cleanup TestContainerOperations #7940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 2 commits into from
Feb 21, 2025
Merged

HDDS-12387. Cleanup TestContainerOperations #7940

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
356d5cc
HDDS-12387. Cleanup TestContainerOperations
chiacyu Feb 20, 2025
110c68d
Removed imports
chiacyu Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions ...ne/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestContainerOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.apache.hadoop.hdds.scm.pipeline.PipelineNotFoundException;
import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
import org.apache.hadoop.hdds.utils.IOUtils;
Expand All @@ -70,33 +69,30 @@ public abstract class TestContainerOperations implements NonHATests.TestCase {
private static final int CONTAINER_LIST_LIMIT = 1;

private ScmClient storageClient;
private StorageContainerLocationProtocolClientSideTranslatorPB storageContainerLocationClient;
private XceiverClientManager xceiverClientManager;

@BeforeAll
void setup() throws Exception {
OzoneConfiguration clientConf = new OzoneConfiguration(cluster().getConf());
clientConf.setInt(ScmConfigKeys.OZONE_SCM_CONTAINER_LIST_MAX_COUNT, CONTAINER_LIST_LIMIT);
storageClient = new ContainerOperationClient(clientConf);
storageContainerLocationClient = cluster().getStorageContainerLocationClient();
xceiverClientManager = new XceiverClientManager(cluster().getConf());
}

@AfterAll
void cleanup() {
IOUtils.closeQuietly(storageContainerLocationClient, xceiverClientManager);
IOUtils.closeQuietly(xceiverClientManager);
}

@Test
void testContainerStateMachineIdempotency() throws Exception {
ContainerWithPipeline container = storageContainerLocationClient
.allocateContainer(HddsProtos.ReplicationType.RATIS,
HddsProtos.ReplicationFactor.ONE, OzoneConsts.OZONE);
ContainerWithPipeline container = storageClient.createContainer(HddsProtos
.ReplicationType.RATIS, HddsProtos.ReplicationFactor
.ONE, OzoneConsts.OZONE);
long containerID = container.getContainerInfo().getContainerID();
Pipeline pipeline = container.getPipeline();
XceiverClientSpi client = xceiverClientManager.acquireClient(pipeline);
//create the container
ContainerProtocolCalls.createContainer(client, containerID, null);

// call create Container again
BlockID blockID = ContainerTestHelper.getTestBlockID(containerID);
byte[] data =
Expand Down Expand Up @@ -227,7 +223,7 @@ public void testNodeOperationalStates() throws Exception {
DatanodeDetails node = nm.getAllNodes().get(0);
nm.setNodeOperationalState(node, DECOMMISSIONING);

// All nodes should be returned as they are all in service
// Nodes not in DECOMMISSIONING state should be returned as they are in service
int nodeCount = storageClient.queryNode(IN_SERVICE, HEALTHY,
HddsProtos.QueryScope.CLUSTER, "").size();
assertEquals(numOfDatanodes - 1, nodeCount);
Expand Down Expand Up @@ -263,7 +259,7 @@ public void testNodeOperationalStates() throws Exception {
nodeCount = storageClient.queryNode(s, HEALTHY,
HddsProtos.QueryScope.CLUSTER, "").size();
if (s == IN_SERVICE) {
assertEquals(5, nodeCount);
assertEquals(cluster().getHddsDatanodes().size(), nodeCount);
} else {
assertEquals(1, nodeCount);
}
Expand Down