From 906b59506346b50b7ee196d8e6bdcbf0403b5bbc Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Tue, 15 Apr 2025 21:52:06 +0800 Subject: [PATCH 1/4] HDDS-12847. Use DatanodeID instead of DatanodeDetails.getUuidString --- .../algorithms/TestContainerPlacementFactory.java | 4 ++-- .../algorithms/TestSCMContainerPlacementCapacity.java | 4 ++-- .../algorithms/TestSCMContainerPlacementRackAware.java | 4 ++-- .../algorithms/TestSCMContainerPlacementRackScatter.java | 4 ++-- .../algorithms/TestSCMContainerPlacementRandom.java | 8 ++++---- .../hdds/scm/pipeline/TestPipelinePlacementFactory.java | 4 ++-- .../hadoop/hdds/scm/TestStorageContainerManager.java | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java index 903ae50115cb..155e7ba3d11c 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java index db5f81ebdefd..00281af41533 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java index 29f83ff062d4..008501170e49 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java index 0fd89f7e9450..9ba6dcc9be9e 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java index 2130537a1b9d..7b32aaddb7ba 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java @@ -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))); @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java index 273d4af6f5ad..9c1a51f8d370 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelinePlacementFactory.java @@ -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))); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java index da824fd801bb..c70173d19ef4 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java @@ -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()); } } From 038a590ac4511f51ddb7e542738725486e2624cc Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Sat, 19 Apr 2025 11:24:41 +0800 Subject: [PATCH 2/4] Added some lefts --- .../hadoop/ozone/HddsDatanodeService.java | 3 +-- .../hdds/scm/container/MockNodeManager.java | 2 +- .../TestContainerPlacementFactory.java | 6 +++--- .../TestSCMContainerPlacementCapacity.java | 6 +++--- .../TestSCMContainerPlacementRackAware.java | 16 ++++++++-------- .../TestSCMContainerPlacementRackScatter.java | 18 +++++++++--------- .../TestSCMContainerPlacementRandom.java | 6 +++--- .../hdds/scm/node/TestDeadNodeHandler.java | 4 ++-- 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java index a37352d8a834..814682df1e83 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java @@ -230,8 +230,7 @@ public String getNamespace() { datanodeDetails.setRevision( HddsVersionInfo.HDDS_VERSION_INFO.getRevision()); TracingUtil.initTracing( - "HddsDatanodeService." + datanodeDetails.getUuidString() - .substring(0, 8), conf); + "HddsDatanodeService." + datanodeDetails.getID(), conf); LOG.info("HddsDatanodeService {}", datanodeDetails); // Authenticate Hdds Datanode service if security is enabled if (OzoneSecurityUtil.isSecurityEnabled(conf)) { diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java index 4904b85876d5..7827ade4f75f 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java @@ -271,7 +271,7 @@ public List 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( diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java index 155e7ba3d11c..55dd2ac96203 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java index 00281af41533..885ba5528250 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementCapacity.java @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java index 008501170e49..c60a4f81c784 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackAware.java @@ -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))); @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java index 9ba6dcc9be9e..dbb9be27a085 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRackScatter.java @@ -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))); @@ -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))); @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java index 7b32aaddb7ba..3171df95db4a 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestSCMContainerPlacementRandom.java @@ -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))); @@ -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))); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java index 854394df757c..c957d0497a3f 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java @@ -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, From 2702e5ecb6b232a8589d2fbf29b5177c82e2f61a Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Sat, 19 Apr 2025 12:41:09 +0800 Subject: [PATCH 3/4] Added some missing parts --- .../main/java/org/apache/hadoop/ozone/HddsDatanodeService.java | 2 +- .../org/apache/hadoop/hdds/scm/container/MockNodeManager.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java index 814682df1e83..0d4f758cbe6f 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java @@ -234,7 +234,7 @@ public String getNamespace() { LOG.info("HddsDatanodeService {}", datanodeDetails); // Authenticate Hdds Datanode service if security is enabled if (OzoneSecurityUtil.isSecurityEnabled(conf)) { - component = "dn-" + datanodeDetails.getUuidString(); + component = "dn-" + datanodeDetails; secConf = new SecurityConfig(conf); if (SecurityUtil.getAuthenticationMethod(conf).equals( diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java index 7827ade4f75f..c1d44eb97706 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java @@ -275,8 +275,7 @@ public List getNodes( capacity, used, remaining, null); MetadataStorageReportProto metaStorage1 = HddsTestUtils.createMetadataStorageReport( - "/metadata1-" + di.getUuidString(), capacity, used, - remaining, null); + "/metadata1-" + di, capacity, used, remaining, null); di.updateStorageReports(Collections.singletonList(storage1)); di.updateMetaDataStorageReports(Collections.singletonList(metaStorage1)); From 9d80995da084f83086a503670801b1c3d6ff97dc Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Sat, 19 Apr 2025 12:50:06 +0800 Subject: [PATCH 4/4] Added missing getID() --- .../main/java/org/apache/hadoop/ozone/HddsDatanodeService.java | 2 +- .../org/apache/hadoop/hdds/scm/container/MockNodeManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java index 0d4f758cbe6f..585cab9d38ab 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java @@ -234,7 +234,7 @@ public String getNamespace() { LOG.info("HddsDatanodeService {}", datanodeDetails); // Authenticate Hdds Datanode service if security is enabled if (OzoneSecurityUtil.isSecurityEnabled(conf)) { - component = "dn-" + datanodeDetails; + component = "dn-" + datanodeDetails.getID(); secConf = new SecurityConfig(conf); if (SecurityUtil.getAuthenticationMethod(conf).equals( diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java index c1d44eb97706..ff96e68f143f 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java @@ -275,7 +275,7 @@ public List getNodes( capacity, used, remaining, null); MetadataStorageReportProto metaStorage1 = HddsTestUtils.createMetadataStorageReport( - "/metadata1-" + di, capacity, used, remaining, null); + "/metadata1-" + di.getID(), capacity, used, remaining, null); di.updateStorageReports(Collections.singletonList(storage1)); di.updateMetaDataStorageReports(Collections.singletonList(metaStorage1));