Skip to content

HDDS-9846. Datanode should not persist cluster ID to global version file until loading all volumes. #5757

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
ChenSammi merged 2 commits into from
Dec 15, 2023
Merged

HDDS-9846. Datanode should not persist cluster ID to global version file until loading all volumes. #5757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f12cc9
HDDS-9846. Datanode should not persist cluster ID to global version f…
ashishkr200 Dec 7, 2023
2795a7b
Use JUnit5
ashishkr200 Dec 7, 2023
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
9 changes: 5 additions & 4 deletions ...in/java/org/apache/hadoop/ozone/container/common/states/endpoint/VersionEndpointTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ public EndpointStateMachine.EndPointStates call() throws Exception {
// If end point is passive, datanode does not need to check volumes.
String scmId = response.getValue(OzoneConsts.SCM_ID);
String clusterId = response.getValue(OzoneConsts.CLUSTER_ID);
DatanodeLayoutStorage layoutStorage
= new DatanodeLayoutStorage(configuration);
layoutStorage.setClusterId(clusterId);
layoutStorage.persistCurrentState();

Preconditions.checkNotNull(scmId,
"Reply from SCM: scmId cannot be null");
Expand All @@ -92,6 +88,11 @@ public EndpointStateMachine.EndPointStates call() throws Exception {
// Check HddsVolumes
checkVolumeSet(ozoneContainer.getVolumeSet(), scmId, clusterId);

DatanodeLayoutStorage layoutStorage
= new DatanodeLayoutStorage(configuration);
layoutStorage.setClusterId(clusterId);
layoutStorage.persistCurrentState();

// Start the container services after getting the version information
ozoneContainer.start(clusterId);
}
Expand Down
28 changes: 28 additions & 0 deletions ...-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.Map;
import java.util.UUID;

import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
Expand Down Expand Up @@ -79,6 +80,7 @@
import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;

import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -285,6 +287,32 @@ public void testDnLayoutVersionFile() throws Exception {
= new DatanodeLayoutStorage(ozoneConf,
"na_expect_storage_initialized");
assertEquals(scmServerImpl.getClusterId(), layout.getClusterID());

// Delete storage volume info
File storageDir = ozoneContainer.getVolumeSet()
.getVolumesList().get(0).getStorageDir();
FileUtils.forceDelete(storageDir);

// Format volume VERSION file with
// different clusterId than SCM clusterId.
ozoneContainer.getVolumeSet().getVolumesList()
.get(0).format("different_cluster_id");
// Update layout clusterId and persist it.
layout.setClusterId("different_cluster_id");
layout.persistCurrentState();

// As the volume level clusterId didn't match with SCM clusterId
// Even after the version call, the datanode layout file should
// not update its clusterID field.
rpcEndPoint.setState(EndpointStateMachine.EndPointStates.GETVERSION);
versionTask.call();
DatanodeLayoutStorage layout1
= new DatanodeLayoutStorage(ozoneConf,
"na_expect_storage_initialized");

assertEquals("different_cluster_id", layout1.getClusterID());
assertNotEquals(scmServerImpl.getClusterId(), layout1.getClusterID());
FileUtils.forceDelete(storageDir);
}
}

Expand Down