Skip to content

HDDS-12740. Use DatanodeID in HddsTestUtils #8281

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 3 commits into from
Apr 15, 2025
Merged

HDDS-12740. Use DatanodeID in HddsTestUtils #8281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e5b357
replace UUID with DatanodeID in HddsTestUtils
peterxcli Apr 14, 2025
358a6ea
change other affected tests
peterxcli Apr 14, 2025
826b517
Use DatanodeID.randomID() instead of MockDatanodeDetails
peterxcli Apr 15, 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
15 changes: 8 additions & 7 deletions hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.DatanodeID;
import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
Expand Down Expand Up @@ -160,8 +161,8 @@ public static NodeReportProto getRandomNodeReport() {
*/
public static NodeReportProto getRandomNodeReport(int numberOfStorageReport,
int numberOfMetadataStorageReport) {
UUID nodeId = UUID.randomUUID();
return getRandomNodeReport(nodeId, File.separator + nodeId,
DatanodeID nodeId = DatanodeID.randomID();
return getRandomNodeReport(nodeId, File.separator + nodeId.getID(),
numberOfStorageReport, numberOfMetadataStorageReport);
}

Expand All @@ -176,7 +177,7 @@ public static NodeReportProto getRandomNodeReport(int numberOfStorageReport,
*
* @return NodeReportProto
*/
public static NodeReportProto getRandomNodeReport(UUID nodeId,
public static NodeReportProto getRandomNodeReport(DatanodeID nodeId,
String basePath, int numberOfStorageReport,
int numberOfMetadataStorageReport) {
List<StorageReportProto> storageReports = new ArrayList<>();
Expand Down Expand Up @@ -218,7 +219,7 @@ public static NodeReportProto createNodeReport(
*
* @return StorageReportProto
*/
public static StorageReportProto getRandomStorageReport(UUID nodeId,
public static StorageReportProto getRandomStorageReport(DatanodeID nodeId,
String path) {
return createStorageReport(nodeId, path,
random.nextInt(1000),
Expand All @@ -243,7 +244,7 @@ public static MetadataStorageReportProto getRandomMetadataStorageReport(
StorageTypeProto.DISK);
}

public static StorageReportProto createStorageReport(UUID nodeId, String path,
public static StorageReportProto createStorageReport(DatanodeID nodeId, String path,
long capacity) {
return createStorageReport(nodeId, path,
capacity,
Expand All @@ -252,7 +253,7 @@ public static StorageReportProto createStorageReport(UUID nodeId, String path,
StorageTypeProto.DISK);
}

public static StorageReportProto createStorageReport(UUID nodeId, String path,
public static StorageReportProto createStorageReport(DatanodeID nodeId, String path,
long capacity, long used, long remaining, StorageTypeProto type) {
return createStorageReport(nodeId, path, capacity, used, remaining,
type, false);
Expand All @@ -269,7 +270,7 @@ public static StorageReportProto createStorageReport(UUID nodeId, String path,
*
* @return StorageReportProto
*/
public static StorageReportProto createStorageReport(UUID nodeId, String path,
public static StorageReportProto createStorageReport(DatanodeID nodeId, String path,
long capacity, long used, long remaining, StorageTypeProto type,
boolean failed) {
Preconditions.checkNotNull(nodeId);
Expand Down
4 changes: 2 additions & 2 deletions ...dds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestSCMCommonPlacementPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,14 +482,14 @@ public void testDatanodeIsInvalidInCaseOfIncreasingCommittedBytes() {

// capacity = 200000, used = 90000, remaining = 101000, committed = 500
StorageContainerDatanodeProtocolProtos.StorageReportProto storageReport1 =
HddsTestUtils.createStorageReport(UUID.randomUUID(), "/data/hdds",
HddsTestUtils.createStorageReport(DatanodeID.randomID(), "/data/hdds",
200000, 90000, 101000, DISK).toBuilder()
.setCommitted(500)
.setFreeSpaceToSpare(10000)
.build();
// capacity = 200000, used = 90000, remaining = 101000, committed = 1000
StorageContainerDatanodeProtocolProtos.StorageReportProto storageReport2 =
HddsTestUtils.createStorageReport(UUID.randomUUID(), "/data/hdds",
HddsTestUtils.createStorageReport(DatanodeID.randomID(), "/data/hdds",
200000, 90000, 101000, DISK).toBuilder()
.setCommitted(1000)
.setFreeSpaceToSpare(100000)
Expand Down
2 changes: 1 addition & 1 deletion ...p-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public List<DatanodeDetails> getNodes(
long used = nodeMetricMap.get(dd).getScmUsed().get();
long remaining = nodeMetricMap.get(dd).getRemaining().get();
StorageReportProto storage1 = HddsTestUtils.createStorageReport(
di.getUuid(), "/data1-" + di.getUuidString(),
di.getID(), "/data1-" + di.getUuidString(),
capacity, used, remaining, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand Down
8 changes: 4 additions & 4 deletions .../apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void testRackAwarePolicy() throws IOException {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getUuid(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand All @@ -122,19 +122,19 @@ public void testRackAwarePolicy() throws IOException {
}

StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getUuid(),
dnInfos.get(2).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getUuid(),
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
STORAGE_CAPACITY, 80L, 20L, null);
dnInfos.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
StorageReportProto storage4 = HddsTestUtils.createStorageReport(
dnInfos.get(4).getUuid(),
dnInfos.get(4).getID(),
"/data1-" + dnInfos.get(4).getUuidString(),
STORAGE_CAPACITY, 70L, 30L, null);
dnInfos.get(4).updateStorageReports(
Expand Down
8 changes: 4 additions & 4 deletions ...che/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void chooseDatanodes() throws SCMException {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getUuid(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
100L, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand All @@ -82,19 +82,19 @@ public void chooseDatanodes() throws SCMException {
}

StorageReportProto storage2 = HddsTestUtils.createStorageReport(
datanodes.get(2).getUuid(),
datanodes.get(2).getID(),
"/data1-" + datanodes.get(2).getUuidString(),
100L, 90L, 10L, null);
datanodes.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
datanodes.get(3).getUuid(),
datanodes.get(3).getID(),
"/data1-" + datanodes.get(3).getUuidString(),
100L, 80L, 20L, null);
datanodes.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
StorageReportProto storage4 = HddsTestUtils.createStorageReport(
datanodes.get(4).getUuid(),
datanodes.get(4).getID(),
"/data1-" + datanodes.get(4).getUuidString(),
100L, 70L, 30L, null);
datanodes.get(4).updateStorageReports(
Expand Down
16 changes: 8 additions & 8 deletions ...he/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private void setup(int datanodeCount) {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getUuid(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand All @@ -132,39 +132,39 @@ private void setup(int datanodeCount) {

if (datanodeCount > 4) {
StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getUuid(),
dnInfos.get(2).getID(),
"/data1-" + datanodes.get(2).getUuidString(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getUuid(),
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
STORAGE_CAPACITY, 80L, 20L, null);
dnInfos.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
StorageReportProto storage4 = HddsTestUtils.createStorageReport(
dnInfos.get(4).getUuid(),
dnInfos.get(4).getID(),
"/data1-" + dnInfos.get(4).getUuidString(),
STORAGE_CAPACITY, 70L, 30L, null);
dnInfos.get(4).updateStorageReports(
new ArrayList<>(Arrays.asList(storage4)));
} else if (datanodeCount > 3) {
StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getUuid(),
dnInfos.get(2).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getUuid(),
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
STORAGE_CAPACITY, 80L, 20L, null);
dnInfos.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
} else if (datanodeCount > 2) {
StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getUuid(),
dnInfos.get(2).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
STORAGE_CAPACITY, 84L, 16L, null);
dnInfos.get(2).updateStorageReports(
Expand Down Expand Up @@ -460,7 +460,7 @@ public void testDatanodeWithDefaultNetworkLocation(int datanodeCount)
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
dnInfo.getUuid(), "/data1-" + dnInfo.getUuidString(),
dnInfo.getID(), "/data1-" + dnInfo.getUuidString(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand Down
18 changes: 9 additions & 9 deletions .../hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private static IntStream numDatanodes() {

private void updateStorageInDatanode(int dnIndex, long used, long remaining) {
StorageReportProto storage = HddsTestUtils.createStorageReport(
dnInfos.get(dnIndex).getUuid(),
dnInfos.get(dnIndex).getID(),
"/data1-" + dnInfos.get(dnIndex).getUuidString(),
STORAGE_CAPACITY, used, remaining, null);
dnInfos.get(dnIndex).updateStorageReports(
Expand Down Expand Up @@ -183,7 +183,7 @@ private void setupDatanode(DatanodeDetails datanodeDetails) {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getUuid(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand All @@ -199,39 +199,39 @@ private void setupDatanode(DatanodeDetails datanodeDetails) {
private void createMocksAndUpdateStorageReports(int datanodeCount) {
if (datanodeCount > 4) {
StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getUuid(),
dnInfos.get(2).getID(),
"/data1-" + datanodes.get(2).getUuidString(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getUuid(),
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
STORAGE_CAPACITY, 80L, 20L, null);
dnInfos.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
StorageReportProto storage4 = HddsTestUtils.createStorageReport(
dnInfos.get(4).getUuid(),
dnInfos.get(4).getID(),
"/data1-" + dnInfos.get(4).getUuidString(),
STORAGE_CAPACITY, 70L, 30L, null);
dnInfos.get(4).updateStorageReports(
new ArrayList<>(Arrays.asList(storage4)));
} else if (datanodeCount > 3) {
StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getUuid(),
dnInfos.get(2).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getUuid(),
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
STORAGE_CAPACITY, 80L, 20L, null);
dnInfos.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
} else if (datanodeCount > 2) {
StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getUuid(),
dnInfos.get(2).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
STORAGE_CAPACITY, 84L, 16L, null);
dnInfos.get(2).updateStorageReports(
Expand Down Expand Up @@ -493,7 +493,7 @@ public void testDatanodeWithDefaultNetworkLocation(int datanodeCount)
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
dnInfo.getUuid(), "/data1-" + dnInfo.getUuidString(),
dnInfo.getID(), "/data1-" + dnInfo.getUuidString(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand Down
8 changes: 4 additions & 4 deletions ...pache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void chooseDatanodes() throws SCMException {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getUuid(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
100L, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand All @@ -79,7 +79,7 @@ public void chooseDatanodes() throws SCMException {
}

StorageReportProto storage2 = HddsTestUtils.createStorageReport(
datanodes.get(2).getUuid(),
datanodes.get(2).getID(),
"/data1-" + datanodes.get(2).getUuidString(),
100L, 90L, 10L, null);
datanodes.get(2).updateStorageReports(
Expand Down Expand Up @@ -170,7 +170,7 @@ public void testIsValidNode() throws SCMException {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getUuid(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
100L, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
Expand All @@ -185,7 +185,7 @@ public void testIsValidNode() throws SCMException {
}

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodes.get(1).getUuid(),
datanodes.get(1).getID(),
"/data1-" + datanodes.get(1).getUuidString(),
100L, 90L, 10L, null);
datanodes.get(1).updateStorageReports(
Expand Down
4 changes: 2 additions & 2 deletions ...hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestContainerPlacement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
import java.time.ZoneId;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.DatanodeID;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos;
import org.apache.hadoop.hdds.scm.HddsTestUtils;
Expand Down Expand Up @@ -191,7 +191,7 @@ public void testContainerPlacementCapacity() throws IOException,
XceiverClientManager xceiverClientManager = null;
try {
for (DatanodeDetails datanodeDetails : datanodes) {
UUID dnId = datanodeDetails.getUuid();
DatanodeID dnId = datanodeDetails.getID();
DatanodeInfo datanodeInfo = scmNodeManager.getNodeStateManager()
.getNode(datanodeDetails.getID());
StorageContainerDatanodeProtocolProtos.StorageReportProto report =
Expand Down
2 changes: 1 addition & 1 deletion ...op-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public void testOnMessage(@TempDir File tempDir) throws Exception {
.concat("/metadata-" + datanode1.getUuidString());

StorageReportProto storageOne = HddsTestUtils.createStorageReport(
datanode1.getUuid(), storagePath, 100 * OzoneConsts.TB,
datanode1.getID(), storagePath, 100 * OzoneConsts.TB,
10 * OzoneConsts.TB, 90 * OzoneConsts.TB, null);
MetadataStorageReportProto metaStorageOne =
HddsTestUtils.createMetadataStorageReport(metaStoragePath,
Expand Down
4 changes: 2 additions & 2 deletions ...-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeReportHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void resetEventCollector() throws IOException {
public void testNodeReport() throws IOException {
DatanodeDetails dn = MockDatanodeDetails.randomDatanodeDetails();
StorageReportProto storageOne = HddsTestUtils
.createStorageReport(dn.getUuid(), storagePath.getPath(), 100, 10, 90, null);
.createStorageReport(dn.getID(), storagePath.getPath(), 100, 10, 90, null);
MetadataStorageReportProto metaStorageOne = HddsTestUtils
.createMetadataStorageReport(metaStoragePath.getPath(), 100, 10, 90, null);

Expand All @@ -101,7 +101,7 @@ public void testNodeReport() throws IOException {
assertEquals(10, (long) nodeMetric.get().getScmUsed().get());

StorageReportProto storageTwo = HddsTestUtils
.createStorageReport(dn.getUuid(), storagePath.getPath(), 100, 10, 90, null);
.createStorageReport(dn.getID(), storagePath.getPath(), 100, 10, 90, null);
nodeReportHandler.onMessage(
getNodeReport(dn, Arrays.asList(storageOne, storageTwo),
Arrays.asList(metaStorageOne)), this);
Expand Down
Loading