You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2026/10/20 05:35:36 UTC

(ozone) branch master updated: HDDS-16656. OM pipeline cache is not updated in different DN currentVersion case (#11370)

This is an automated email from the ASF dual-hosted git repository.

smengcl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new b94df213f20 HDDS-16656. OM pipeline cache is not updated in different DN currentVersion case (#11370)
b94df213f20 is described below

commit b94df213f20ec0d675f079b57a4566e4e64e4060
Author: Sammi Chen <sa...@apache.org>
AuthorDate: Tue Oct 20 13:35:29 2026 +0800

    HDDS-16656. OM pipeline cache is not updated in different DN currentVersion case (#11370)
---
 .../hadoop/hdds/protocol/DatanodeDetails.java      | 14 ++++
 .../common/helpers/TestDatanodeIdYaml.java         |  4 ++
 .../org/apache/hadoop/ozone/om/KeyManagerImpl.java |  6 +-
 .../java/org/apache/hadoop/ozone/om/ScmClient.java |  7 +-
 .../org/apache/hadoop/ozone/om/TestScmClient.java  | 77 ++++++++++++++++++++++
 5 files changed, 102 insertions(+), 6 deletions(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
index befb0ed373b..bd35290c52f 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
@@ -698,6 +698,8 @@ public String toDebugString() {
         ", certSerialId: " + certSerialId +
         ", persistedOpState: " + persistedOpState +
         ", persistedOpStateExpiryEpochSec: " + persistedOpStateExpiryEpochSec +
+        ", version: " + version +
+        ", currentVersion: " + currentVersion +
         "}";
   }
 
@@ -725,6 +727,18 @@ public boolean compareNodeValues(DatanodeDetails datanodeDetails) {
         && Objects.equals(hostName, datanodeDetails.hostName) && Objects.equals(ports, datanodeDetails.ports);
   }
 
+  /**
+   * Checks whether the wire-protocol capability version (currentVersion) of
+   * the two nodes matches. Caching layers need to evict a cached
+   * entry when the DN advertises a newer capability version.
+   *
+   * @param datanodeDetails the other DatanodeDetails to compare.
+   * @return true if both nodes advertise the same currentVersion.
+   */
+  public boolean compareNodeVersions(DatanodeDetails datanodeDetails) {
+    return this.getSerializedCurrentVersion() == datanodeDetails.getSerializedCurrentVersion();
+  }
+
   @Override
   public int hashCode() {
     return id.hashCode();
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeIdYaml.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeIdYaml.java
index 27b4e1c135b..abfe6418a61 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeIdYaml.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/helpers/TestDatanodeIdYaml.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.UUID;
+import org.apache.hadoop.hdds.HDDSVersion;
 import org.apache.hadoop.hdds.HddsConfigKeys;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
@@ -50,6 +51,9 @@ void testWriteRead(@TempDir File dir) throws IOException {
     DatanodeDetails read = DatanodeIdYaml.readDatanodeIdFile(file);
 
     assertEquals(original, read);
+    // currentVersion is not persisted in datanode.id
+    assertEquals(HDDSVersion.DEFAULT_VERSION, read.getCurrentVersion());
+    read.setCurrentVersion(original.getCurrentVersion());
     assertEquals(original.toDebugString(), read.toDebugString());
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index d74614579e2..445160972d8 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -770,8 +770,7 @@ protected void refreshPipeline(List<OmKeyInfo> keyList) throws IOException {
           for (OmKeyLocationInfo omKeyLocationInfo : omKeyLocationInfoList) {
             ContainerWithPipeline cp = containerWithPipelineMap.get(
                 omKeyLocationInfo.getContainerID());
-            if (cp != null &&
-                !cp.getPipeline().equals(omKeyLocationInfo.getPipeline())) {
+            if (cp != null && cp.getPipeline() != null) {
               omKeyLocationInfo.setPipeline(cp.getPipeline());
             }
           }
@@ -2564,8 +2563,7 @@ private void setUpdatedContainerLocation(OmKeyInfo keyInfo,
         for (OmKeyLocationInfo omKeyLocationInfo : omKeyLocationInfoList) {
           Pipeline pipeline = containerLocations.get(
               omKeyLocationInfo.getContainerID());
-          if (pipeline != null &&
-              !pipeline.equals(omKeyLocationInfo.getPipeline())) {
+          if (pipeline != null) {
             omKeyLocationInfo.setPipeline(pipeline);
           }
         }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
index 002149cbfb0..f695c53fa4b 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ScmClient.java
@@ -146,8 +146,11 @@ static Pipeline newPipelineWithDNCache(Pipeline pipeline,
     for (DatanodeDetails node : pipeline.getNodes()) {
       DatanodeDetails datanodeDetails =
           datanodeDetailsCache.getIfPresent(node.getID());
-      // Call compareNodeValues to handle IP / hostname changes
-      if (datanodeDetails != null && node.compareNodeValues(datanodeDetails)) {
+      // Use the cached entry only when it matches on both network identity
+      // (compareNodeValues: hostname / IP / ports) and wire-protocol capability
+      // version (compareNodeVersions: currentVersion).
+      if (datanodeDetails != null && node.compareNodeValues(datanodeDetails)
+          && node.compareNodeVersions(datanodeDetails)) {
         nodes.add(datanodeDetails);
       } else {
         datanodeDetailsCache.put(node.getID(), node);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java
index fd5c987c144..3e70deb8c3f 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java
@@ -22,6 +22,7 @@
 import static org.apache.hadoop.hdds.client.ReplicationConfig.fromTypeAndFactor;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.eq;
@@ -41,6 +42,7 @@
 import java.util.UUID;
 import java.util.stream.Stream;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.hadoop.hdds.HDDSVersion;
 import org.apache.hadoop.hdds.client.ReplicationFactor;
 import org.apache.hadoop.hdds.client.ReplicationType;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -63,6 +65,13 @@
  * ScmClient test-cases.
  */
 public class TestScmClient {
+  /**
+   * Wire values that are not defined in {@link HDDSVersion} on this OM deserialize to
+   * {@link HDDSVersion#UNKNOWN_VERSION} while {@link DatanodeDetails#getSerializedCurrentVersion()}
+   * keeps the original int.
+   */
+  private static final int UNKNOWN_WIRE_VERSION_A = 500;
+  private static final int UNKNOWN_WIRE_VERSION_B = 501;
   private StorageContainerLocationInternalInterface containerLocationProtocol;
   private ScmClient scmClient;
 
@@ -257,4 +266,72 @@ private DatanodeDetails randomDatanode() {
         .build();
   }
 
+  @Test
+  public void testDatanodeDetailsCacheUpdatesCurrentVersionChange() {
+    Cache<DatanodeID, DatanodeDetails> datanodeDetailsCache = CacheBuilder.newBuilder().build();
+    DatanodeDetails original = randomDatanode();
+    original.setCurrentVersion(HDDSVersion.STREAM_BLOCK_SUPPORT);
+    DatanodeDetails upgraded = DatanodeDetails.newBuilder()
+        .setDatanodeDetails(original)
+        .setCurrentVersion(HDDSVersion.SHORT_CIRCUIT_READS)
+        .build();
+
+    ScmClient.newPipelineWithDNCache(createPipeline(1L, asList(original)).getPipeline(), datanodeDetailsCache);
+    Pipeline refreshed = ScmClient.newPipelineWithDNCache(
+        createPipeline(2L, asList(upgraded)).getPipeline(), datanodeDetailsCache);
+
+    assertSame(upgraded, refreshed.getNodes().get(0));
+    assertEquals(HDDSVersion.SHORT_CIRCUIT_READS, refreshed.getNodes().get(0).getCurrentVersion());
+    assertSame(upgraded, datanodeDetailsCache.getIfPresent(original.getID()));
+  }
+
+  @Test
+  public void testDatanodeDetailsCacheUpdatesKnownVersionToUnknownWireVersion() {
+    Cache<DatanodeID, DatanodeDetails> datanodeDetailsCache = CacheBuilder.newBuilder().build();
+    DatanodeDetails original = randomDatanode();
+    original.setCurrentVersion(HDDSVersion.SHORT_CIRCUIT_READS);
+    DatanodeDetails upgraded = sameNodeWithWireVersion(original, UNKNOWN_WIRE_VERSION_A);
+
+    ScmClient.newPipelineWithDNCache(
+        createPipeline(1L, asList(original)).getPipeline(), datanodeDetailsCache);
+    Pipeline refreshed = ScmClient.newPipelineWithDNCache(
+        createPipeline(2L, asList(upgraded)).getPipeline(), datanodeDetailsCache);
+
+    DatanodeDetails refreshedNode = refreshed.getNodes().get(0);
+    assertSame(upgraded, refreshedNode);
+    assertEquals(HDDSVersion.UNKNOWN_VERSION, refreshedNode.getCurrentVersion());
+    assertEquals(UNKNOWN_WIRE_VERSION_A, refreshedNode.getSerializedCurrentVersion());
+    assertSame(upgraded, datanodeDetailsCache.getIfPresent(original.getID()));
+  }
+
+  @Test
+  public void testDatanodeDetailsCacheUpdatesDifferentUnknownWireVersions() {
+    Cache<DatanodeID, DatanodeDetails> datanodeDetailsCache = CacheBuilder.newBuilder().build();
+    DatanodeDetails original = sameNodeWithWireVersion(randomDatanode(), UNKNOWN_WIRE_VERSION_A);
+    DatanodeDetails upgraded = sameNodeWithWireVersion(original, UNKNOWN_WIRE_VERSION_B);
+
+    assertEquals(HDDSVersion.UNKNOWN_VERSION, original.getCurrentVersion());
+    assertEquals(HDDSVersion.UNKNOWN_VERSION, upgraded.getCurrentVersion());
+    assertNotEquals(original.getSerializedCurrentVersion(), upgraded.getSerializedCurrentVersion());
+
+    ScmClient.newPipelineWithDNCache(
+        createPipeline(1L, asList(original)).getPipeline(), datanodeDetailsCache);
+    Pipeline refreshed = ScmClient.newPipelineWithDNCache(
+        createPipeline(2L, asList(upgraded)).getPipeline(), datanodeDetailsCache);
+
+    DatanodeDetails refreshedNode = refreshed.getNodes().get(0);
+    assertSame(upgraded, refreshedNode);
+    assertEquals(HDDSVersion.UNKNOWN_VERSION, refreshedNode.getCurrentVersion());
+    assertEquals(UNKNOWN_WIRE_VERSION_B, refreshedNode.getSerializedCurrentVersion());
+    assertSame(upgraded, datanodeDetailsCache.getIfPresent(original.getID()));
+    assertEquals(UNKNOWN_WIRE_VERSION_B,
+        datanodeDetailsCache.getIfPresent(original.getID()).getSerializedCurrentVersion());
+  }
+
+  private static DatanodeDetails sameNodeWithWireVersion(DatanodeDetails base, int wireVersion) {
+    return DatanodeDetails.newBuilder()
+        .setDatanodeDetails(base)
+        .setCurrentVersion(wireVersion)
+        .build();
+  }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org