Skip to content

HDDS-12847. Use DatanodeID instead of DatanodeDetails.getUuidString #8293

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 4 commits into from
Apr 19, 2025
Merged

HDDS-12847. Use DatanodeID instead of DatanodeDetails.getUuidString #8293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
906b595
HDDS-12847. Use DatanodeID instead of DatanodeDetails.getUuidString
chiacyu Apr 15, 2025
038a590
Added some lefts
chiacyu Apr 19, 2025
2702e5e
Added some missing parts
chiacyu Apr 19, 2025
9d80995
Added missing getID()
chiacyu Apr 19, 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
5 changes: 2 additions & 3 deletions hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,11 @@ public String getNamespace() {
datanodeDetails.setRevision(
HddsVersionInfo.HDDS_VERSION_INFO.getRevision());
TracingUtil.initTracing(
"HddsDatanodeService." + datanodeDetails.getUuidString()
.substring(0, 8), conf);
"HddsDatanodeService." + datanodeDetails.getID(), conf);
Copy link
Contributor

@adoroszlai adoroszlai Apr 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

substring is missing, but this is only for distributed tracing, so I think it's OK.

LOG.info("HddsDatanodeService {}", datanodeDetails);
// Authenticate Hdds Datanode service if security is enabled
if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
component = "dn-" + datanodeDetails.getUuidString();
component = "dn-" + datanodeDetails.getID();
secConf = new SecurityConfig(conf);

if (SecurityUtil.getAuthenticationMethod(conf).equals(
Expand Down
5 changes: 2 additions & 3 deletions ...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,12 +271,11 @@ public List<DatanodeDetails> getNodes(
long used = nodeMetricMap.get(dd).getScmUsed().get();
long remaining = nodeMetricMap.get(dd).getRemaining().get();
StorageReportProto storage1 = HddsTestUtils.createStorageReport(
di.getID(), "/data1-" + di.getUuidString(),
di.getID(), "/data1-" + di.getID(),
capacity, used, remaining, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + di.getUuidString(), capacity, used,
remaining, null);
"/metadata1-" + di.getID(), capacity, used, remaining, null);
di.updateStorageReports(Collections.singletonList(storage1));
di.updateMetaDataStorageReports(Collections.singletonList(metaStorage1));

Expand Down
10 changes: 5 additions & 5 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,11 +105,11 @@ public void testRackAwarePolicy() throws IOException {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + datanodeInfo.getUuidString(),
"/metadata1-" + datanodeInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
datanodeInfo.updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));
Expand All @@ -123,19 +123,19 @@ public void testRackAwarePolicy() throws IOException {

StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
"/data1-" + dnInfos.get(2).getID(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
"/data1-" + dnInfos.get(3).getID(),
STORAGE_CAPACITY, 80L, 20L, null);
dnInfos.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
StorageReportProto storage4 = HddsTestUtils.createStorageReport(
dnInfos.get(4).getID(),
"/data1-" + dnInfos.get(4).getUuidString(),
"/data1-" + dnInfos.get(4).getID(),
STORAGE_CAPACITY, 70L, 30L, null);
dnInfos.get(4).updateStorageReports(
new ArrayList<>(Arrays.asList(storage4)));
Expand Down
10 changes: 5 additions & 5 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,11 +67,11 @@ public void chooseDatanodes() throws SCMException {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getID(),
100L, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + datanodeInfo.getUuidString(),
"/metadata1-" + datanodeInfo.getID(),
100L, 0, 100L, null);
datanodeInfo.updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));
Expand All @@ -83,19 +83,19 @@ public void chooseDatanodes() throws SCMException {

StorageReportProto storage2 = HddsTestUtils.createStorageReport(
datanodes.get(2).getID(),
"/data1-" + datanodes.get(2).getUuidString(),
"/data1-" + datanodes.get(2).getID(),
100L, 90L, 10L, null);
datanodes.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
datanodes.get(3).getID(),
"/data1-" + datanodes.get(3).getUuidString(),
"/data1-" + datanodes.get(3).getID(),
100L, 80L, 20L, null);
datanodes.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
StorageReportProto storage4 = HddsTestUtils.createStorageReport(
datanodes.get(4).getID(),
"/data1-" + datanodes.get(4).getUuidString(),
"/data1-" + datanodes.get(4).getID(),
100L, 70L, 30L, null);
datanodes.get(4).updateStorageReports(
new ArrayList<>(Arrays.asList(storage4)));
Expand Down
20 changes: 10 additions & 10 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,11 +117,11 @@ private void setup(int datanodeCount) {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + datanodeInfo.getUuidString(),
"/metadata1-" + datanodeInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
datanodeInfo.updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));
Expand All @@ -133,39 +133,39 @@ private void setup(int datanodeCount) {
if (datanodeCount > 4) {
StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getID(),
"/data1-" + datanodes.get(2).getUuidString(),
"/data1-" + datanodes.get(2).getID(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
"/data1-" + dnInfos.get(3).getID(),
STORAGE_CAPACITY, 80L, 20L, null);
dnInfos.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
StorageReportProto storage4 = HddsTestUtils.createStorageReport(
dnInfos.get(4).getID(),
"/data1-" + dnInfos.get(4).getUuidString(),
"/data1-" + dnInfos.get(4).getID(),
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).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
"/data1-" + dnInfos.get(2).getID(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
"/data1-" + dnInfos.get(3).getID(),
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).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
"/data1-" + dnInfos.get(2).getID(),
STORAGE_CAPACITY, 84L, 16L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
Expand Down Expand Up @@ -460,11 +460,11 @@ public void testDatanodeWithDefaultNetworkLocation(int datanodeCount)
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
dnInfo.getID(), "/data1-" + dnInfo.getUuidString(),
dnInfo.getID(), "/data1-" + dnInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + dnInfo.getUuidString(),
"/metadata1-" + dnInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
dnInfo.updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));
Expand Down
22 changes: 11 additions & 11 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 @@ -98,7 +98,7 @@ private static IntStream numDatanodes() {
private void updateStorageInDatanode(int dnIndex, long used, long remaining) {
StorageReportProto storage = HddsTestUtils.createStorageReport(
dnInfos.get(dnIndex).getID(),
"/data1-" + dnInfos.get(dnIndex).getUuidString(),
"/data1-" + dnInfos.get(dnIndex).getID(),
STORAGE_CAPACITY, used, remaining, null);
dnInfos.get(dnIndex).updateStorageReports(
new ArrayList<>(Arrays.asList(storage)));
Expand Down Expand Up @@ -183,11 +183,11 @@ private void setupDatanode(DatanodeDetails datanodeDetails) {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + datanodeInfo.getUuidString(),
"/metadata1-" + datanodeInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
datanodeInfo.updateStorageReports(
new ArrayList<>(Collections.singletonList(storage1)));
Expand All @@ -200,39 +200,39 @@ private void createMocksAndUpdateStorageReports(int datanodeCount) {
if (datanodeCount > 4) {
StorageReportProto storage2 = HddsTestUtils.createStorageReport(
dnInfos.get(2).getID(),
"/data1-" + datanodes.get(2).getUuidString(),
"/data1-" + datanodes.get(2).getID(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
"/data1-" + dnInfos.get(3).getID(),
STORAGE_CAPACITY, 80L, 20L, null);
dnInfos.get(3).updateStorageReports(
new ArrayList<>(Arrays.asList(storage3)));
StorageReportProto storage4 = HddsTestUtils.createStorageReport(
dnInfos.get(4).getID(),
"/data1-" + dnInfos.get(4).getUuidString(),
"/data1-" + dnInfos.get(4).getID(),
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).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
"/data1-" + dnInfos.get(2).getID(),
STORAGE_CAPACITY, 90L, 10L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
StorageReportProto storage3 = HddsTestUtils.createStorageReport(
dnInfos.get(3).getID(),
"/data1-" + dnInfos.get(3).getUuidString(),
"/data1-" + dnInfos.get(3).getID(),
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).getID(),
"/data1-" + dnInfos.get(2).getUuidString(),
"/data1-" + dnInfos.get(2).getID(),
STORAGE_CAPACITY, 84L, 16L, null);
dnInfos.get(2).updateStorageReports(
new ArrayList<>(Arrays.asList(storage2)));
Expand Down Expand Up @@ -493,11 +493,11 @@ public void testDatanodeWithDefaultNetworkLocation(int datanodeCount)
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
dnInfo.getID(), "/data1-" + dnInfo.getUuidString(),
dnInfo.getID(), "/data1-" + dnInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + dnInfo.getUuidString(),
"/metadata1-" + dnInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
dnInfo.updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));
Expand Down
14 changes: 7 additions & 7 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,11 +64,11 @@ public void chooseDatanodes() throws SCMException {
UpgradeUtils.defaultLayoutVersionProto());

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getID(),
100L, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + datanodeInfo.getUuidString(),
"/metadata1-" + datanodeInfo.getID(),
100L, 0, 100L, null);
datanodeInfo.updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));
Expand All @@ -80,7 +80,7 @@ public void chooseDatanodes() throws SCMException {

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

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getID(),
100L, 0, 100L, null);
MetadataStorageReportProto metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + datanodeInfo.getUuidString(),
"/metadata1-" + datanodeInfo.getID(),
100L, 0, 100L, null);
datanodeInfo.updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));
Expand All @@ -186,14 +186,14 @@ public void testIsValidNode() throws SCMException {

StorageReportProto storage1 = HddsTestUtils.createStorageReport(
datanodes.get(1).getID(),
"/data1-" + datanodes.get(1).getUuidString(),
"/data1-" + datanodes.get(1).getID(),
100L, 90L, 10L, null);
datanodes.get(1).updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));

MetadataStorageReportProto metaStorage2 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + datanodes.get(2).getUuidString(),
"/metadata1-" + datanodes.get(2).getID(),
100L, 90, 10L, null);
datanodes.get(2).updateMetaDataStorageReports(
new ArrayList<>(Arrays.asList(metaStorage2)));
Expand Down
4 changes: 2 additions & 2 deletions ...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 @@ -140,9 +140,9 @@ public void testOnMessage(@TempDir File tempDir) throws Exception {
DatanodeDetails datanode3 = MockDatanodeDetails.randomDatanodeDetails();

String storagePath = tempDir.getPath()
.concat("/data-" + datanode1.getUuidString());
.concat("/data-" + datanode1.getID());
String metaStoragePath = tempDir.getPath()
.concat("/metadata-" + datanode1.getUuidString());
.concat("/metadata-" + datanode1.getID());

StorageReportProto storageOne = HddsTestUtils.createStorageReport(
datanode1.getID(), storagePath, 100 * OzoneConsts.TB,
Expand Down
4 changes: 2 additions & 2 deletions ...r-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ private void setupRacks(int datanodeCount, int nodesPerRack,

StorageContainerDatanodeProtocolProtos.StorageReportProto storage1 =
HddsTestUtils.createStorageReport(
datanodeInfo.getID(), "/data1-" + datanodeInfo.getUuidString(),
datanodeInfo.getID(), "/data1-" + datanodeInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
StorageContainerDatanodeProtocolProtos.MetadataStorageReportProto
metaStorage1 =
HddsTestUtils.createMetadataStorageReport(
"/metadata1-" + datanodeInfo.getUuidString(),
"/metadata1-" + datanodeInfo.getID(),
STORAGE_CAPACITY, 0, 100L, null);
datanodeInfo.updateStorageReports(
new ArrayList<>(Arrays.asList(storage1)));
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ private void testScmProcessDatanodeHeartbeat(MiniOzoneCluster cluster) {
DatanodeInfo datanodeInfo = assertInstanceOf(DatanodeInfo.class, nodeManager.getNode(node.getID()));
assertNotNull(datanodeInfo);
assertThat(datanodeInfo.getLastHeartbeatTime()).isPositive();
assertEquals(datanodeInfo.getUuidString(), datanodeInfo.getNetworkName());
assertEquals(datanodeInfo.getID().toString(), datanodeInfo.getNetworkName());
assertEquals("/rack1", datanodeInfo.getNetworkLocation());
}
}
Expand Down