From be4b6f744df79cc251479562a8691289d4031730 Mon Sep 17 00:00:00 2001 From: Rishabh Patel Date: Mon, 19 May 2025 07:06:27 -0700 Subject: [PATCH 1/2] HDDS-13073. Randomize pipeline id for the checksums verifier --- .../apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java index 0f4729fbae27..8a393166acad 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java @@ -31,6 +31,7 @@ import org.apache.hadoop.hdds.scm.XceiverClientManager; import org.apache.hadoop.hdds.scm.cli.ContainerOperationClient; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; +import org.apache.hadoop.hdds.scm.pipeline.PipelineID; import org.apache.hadoop.ozone.client.io.BlockInputStreamFactoryImpl; import org.apache.hadoop.ozone.common.OzoneChecksumException; import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; @@ -60,6 +61,7 @@ public ChecksumVerifier(OzoneConfiguration conf) throws IOException { public BlockVerificationResult verifyBlock(DatanodeDetails datanode, OmKeyLocationInfo keyLocation, int replicaIndex) { Pipeline pipeline = Pipeline.newBuilder(keyLocation.getPipeline()) + .setId(PipelineID.randomId()) .setReplicationConfig(StandaloneReplicationConfig.getInstance(ONE)) .setNodes(Collections.singletonList(datanode)) .setReplicaIndexes(Collections.singletonMap(datanode, replicaIndex)) From 78ad5c84f7f4a55b8315c2f9b73b45c5214e32b9 Mon Sep 17 00:00:00 2001 From: Rishabh Patel Date: Tue, 20 May 2025 10:14:46 -0700 Subject: [PATCH 2/2] HDDS-13073. Use datanode id as the pipeline id --- .../apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java index 8a393166acad..7f099bede009 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/replicas/ChecksumVerifier.java @@ -31,7 +31,6 @@ import org.apache.hadoop.hdds.scm.XceiverClientManager; import org.apache.hadoop.hdds.scm.cli.ContainerOperationClient; import org.apache.hadoop.hdds.scm.pipeline.Pipeline; -import org.apache.hadoop.hdds.scm.pipeline.PipelineID; import org.apache.hadoop.ozone.client.io.BlockInputStreamFactoryImpl; import org.apache.hadoop.ozone.common.OzoneChecksumException; import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo; @@ -61,7 +60,7 @@ public ChecksumVerifier(OzoneConfiguration conf) throws IOException { public BlockVerificationResult verifyBlock(DatanodeDetails datanode, OmKeyLocationInfo keyLocation, int replicaIndex) { Pipeline pipeline = Pipeline.newBuilder(keyLocation.getPipeline()) - .setId(PipelineID.randomId()) + .setId(datanode.getID()) .setReplicationConfig(StandaloneReplicationConfig.getInstance(ONE)) .setNodes(Collections.singletonList(datanode)) .setReplicaIndexes(Collections.singletonMap(datanode, replicaIndex))