You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by so...@apache.org on 2026/05/05 13:22:41 UTC
(ozone) 02/02: Additional changes on top of merge commit to fix compile issues
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch HDDS-14496-zdu
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 0b1024f790c71bd9e0731fe591cabde1cbdd758a
Author: S O'Donnell <so...@cloudera.com>
AuthorDate: Thu Apr 30 19:22:40 2026 +0100
Additional changes on top of merge commit to fix compile issues
---
.../hadoop/hdds/scm/node/TestDeadNodeHandler.java | 172 ---------------------
.../ozone/om/helpers/OmMultipartPartInfo.java | 2 +-
.../protocolPB/TestOzoneManagerRequestHandler.java | 11 +-
3 files changed, 8 insertions(+), 177 deletions(-)
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 d1a3778d667..e1416b45da9 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
@@ -22,11 +22,8 @@
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.clearInvocations;
-import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -36,9 +33,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.Set;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
@@ -295,173 +290,6 @@ public void testOnMessage(@TempDir File tempDir) throws Exception {
}
- /**
- * Verifies that DeadNodeHandler skips topology removal when the node has
- * already been resurrected (state changed from DEAD to HEALTHY_READONLY).
- */
- @Test
- public void testDeadNodeHandlerSkipsRemovalWhenNodeResurrected(
- @TempDir File tempDir) throws Exception {
- DatanodeDetails datanode = MockDatanodeDetails.randomDatanodeDetails();
- String storagePath = tempDir.getPath()
- .concat("/data-" + datanode.getID());
- String metaStoragePath = tempDir.getPath()
- .concat("/metadata-" + datanode.getID());
- StorageReportProto storageReport = HddsTestUtils.createStorageReport(
- datanode.getID(), storagePath, 100 * OzoneConsts.TB,
- 10 * OzoneConsts.TB, 90 * OzoneConsts.TB, null);
- MetadataStorageReportProto metaStorageReport =
- HddsTestUtils.createMetadataStorageReport(metaStoragePath,
- 100 * OzoneConsts.GB, 10 * OzoneConsts.GB,
- 90 * OzoneConsts.GB, null);
- nodeManager.register(datanode,
- HddsTestUtils.createNodeReport(Arrays.asList(storageReport),
- Arrays.asList(metaStorageReport)), null);
- datanode = nodeManager.getNode(datanode.getID());
-
- assertTrue(
- nodeManager.getClusterNetworkTopologyMap().contains(datanode));
-
- // Simulate: DEAD_NODE event was fired, but before DeadNodeHandler
- // processes it, the node heartbeated and was resurrected to
- // HEALTHY_READONLY. The handler should see the current state and
- // skip removal.
- setNodeHealthState(datanode, HddsProtos.NodeState.HEALTHY_READONLY);
- deadNodeHandler.onMessage(datanode, publisher);
-
- assertTrue(
- nodeManager.getClusterNetworkTopologyMap().contains(datanode),
- "Node should remain in topology when it has been resurrected");
- }
-
- /**
- * Verifies that HealthyReadOnlyNodeHandler re-adds a node to topology
- * even if it was removed by a concurrent DeadNodeHandler.
- */
- @Test
- public void testHealthyReadOnlyHandlerAddsRemovedNode(
- @TempDir File tempDir) throws Exception {
- DatanodeDetails datanode = MockDatanodeDetails.randomDatanodeDetails();
- String storagePath = tempDir.getPath()
- .concat("/data-" + datanode.getID());
- String metaStoragePath = tempDir.getPath()
- .concat("/metadata-" + datanode.getID());
- StorageReportProto storageReport = HddsTestUtils.createStorageReport(
- datanode.getID(), storagePath, 100 * OzoneConsts.TB,
- 10 * OzoneConsts.TB, 90 * OzoneConsts.TB, null);
- MetadataStorageReportProto metaStorageReport =
- HddsTestUtils.createMetadataStorageReport(metaStoragePath,
- 100 * OzoneConsts.GB, 10 * OzoneConsts.GB,
- 90 * OzoneConsts.GB, null);
- nodeManager.register(datanode,
- HddsTestUtils.createNodeReport(Arrays.asList(storageReport),
- Arrays.asList(metaStorageReport)), null);
- datanode = nodeManager.getNode(datanode.getID());
-
- // Manually remove node from topology to simulate DeadNodeHandler
- // having run first.
- nodeManager.getClusterNetworkTopologyMap().remove(datanode);
- assertFalse(
- nodeManager.getClusterNetworkTopologyMap().contains(datanode));
-
- // HealthyReadOnlyNodeHandler should add it back unconditionally.
- healthyReadOnlyNodeHandler.onMessage(datanode, publisher);
- assertTrue(
- nodeManager.getClusterNetworkTopologyMap().contains(datanode),
- "Node should be re-added to topology by HealthyReadOnlyNodeHandler");
- }
-
- /**
- * Reproduces the race condition between DeadNodeHandler and
- * HealthyReadOnlyNodeHandler where interleaved execution could leave
- * a resurrected node missing from the network topology.
- *
- * The interleaving being tested:
- * 1. DeadNodeHandler starts processing (slow: closing containers, etc.)
- * 2. Node is resurrected (DEAD -> HEALTHY_READONLY) via heartbeat
- * 3. HealthyReadOnlyNodeHandler runs, sees node in topology, does not add
- * 4. DeadNodeHandler finishes and removes node from topology
- *
- * With the fix: step 4 checks current state and skips removal.
- */
- @Test
- public void testDeadNodeAndHealthyReadOnlyRaceCondition(
- @TempDir File tempDir) throws Exception {
- DatanodeDetails datanode = MockDatanodeDetails.randomDatanodeDetails();
- String storagePath = tempDir.getPath()
- .concat("/data-" + datanode.getID());
- String metaStoragePath = tempDir.getPath()
- .concat("/metadata-" + datanode.getID());
- StorageReportProto storageReport = HddsTestUtils.createStorageReport(
- datanode.getID(), storagePath, 100 * OzoneConsts.TB,
- 10 * OzoneConsts.TB, 90 * OzoneConsts.TB, null);
- MetadataStorageReportProto metaStorageReport =
- HddsTestUtils.createMetadataStorageReport(metaStoragePath,
- 100 * OzoneConsts.GB, 10 * OzoneConsts.GB,
- 90 * OzoneConsts.GB, null);
- nodeManager.register(datanode,
- HddsTestUtils.createNodeReport(Arrays.asList(storageReport),
- Arrays.asList(metaStorageReport)), null);
- datanode = nodeManager.getNode(datanode.getID());
-
- assertTrue(
- nodeManager.getClusterNetworkTopologyMap().contains(datanode));
-
- // Block DeadNodeHandler just before the topology removal by making
- // deletedBlockLog.onDatanodeDead() pause. This call happens right
- // before the topology check in the handler.
- CountDownLatch deadHandlerBlocked = new CountDownLatch(1);
- CountDownLatch proceedWithRemoval = new CountDownLatch(1);
-
- DeletedBlockLog blockingDeletedBlockLog = mock(DeletedBlockLog.class);
- doAnswer(invocation -> {
- deadHandlerBlocked.countDown();
- proceedWithRemoval.await();
- return null;
- }).when(blockingDeletedBlockLog).onDatanodeDead(any());
-
- setNodeHealthState(datanode, HddsProtos.NodeState.DEAD);
-
- DeadNodeHandler blockingDeadHandler = new DeadNodeHandler(nodeManager,
- mock(PipelineManager.class), containerManager,
- blockingDeletedBlockLog);
-
- DatanodeDetails finalDatanode = datanode;
- AtomicReference<Exception> threadException = new AtomicReference<>();
- Thread deadHandlerThread = new Thread(() -> {
- try {
- blockingDeadHandler.onMessage(finalDatanode, publisher);
- } catch (Exception e) {
- threadException.set(e);
- }
- });
- deadHandlerThread.start();
-
- // Wait for DeadNodeHandler to be blocked mid-execution.
- assertTrue(deadHandlerBlocked.await(10, TimeUnit.SECONDS),
- "DeadNodeHandler should have started processing");
-
- // Simulate resurrection: node transitions to HEALTHY_READONLY.
- setNodeHealthState(datanode, HddsProtos.NodeState.HEALTHY_READONLY);
-
- // HealthyReadOnlyNodeHandler runs while DeadNodeHandler is blocked.
- healthyReadOnlyNodeHandler.onMessage(datanode, publisher);
-
- // Release the DeadNodeHandler to finish.
- proceedWithRemoval.countDown();
- deadHandlerThread.join(10_000);
-
- assertNull(threadException.get(),
- "DeadNodeHandler should not throw");
-
- // With the fix, the node should remain in topology because
- // DeadNodeHandler sees the node is no longer DEAD and skips removal.
- assertTrue(
- nodeManager.getClusterNetworkTopologyMap().contains(datanode),
- "Resurrected node must remain in topology after race between "
- + "DeadNodeHandler and HealthyReadOnlyNodeHandler");
- }
-
private void setNodeHealthState(DatanodeDetails datanode,
HddsProtos.NodeState healthState) throws NodeNotFoundException {
DatanodeInfo dnInfo = nodeManager.getNodeStateManager()
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartPartInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartPartInfo.java
index f8bf57de149..d325f7a81bb 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartPartInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartPartInfo.java
@@ -316,7 +316,7 @@ private KeyLocationList getKeyLocationInfosAsProto() {
if (keyLocationInfos == null || keyLocationInfos.isEmpty()) {
throw new IllegalArgumentException("keyLocationList is required");
}
- return keyLocationInfos.get(0).getProtobuf(true, ClientVersion.CURRENT_VERSION);
+ return keyLocationInfos.get(0).getProtobuf(true, ClientVersion.CURRENT.serialize());
}
private static List<OmKeyLocationInfoGroup> getKeyLocationInfosFromProto(
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOzoneManagerRequestHandler.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOzoneManagerRequestHandler.java
index 5e796ad0dbc..5424a970dc7 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOzoneManagerRequestHandler.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOzoneManagerRequestHandler.java
@@ -17,6 +17,8 @@
package org.apache.hadoop.ozone.protocolPB;
+import static org.mockito.ArgumentMatchers.any;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
@@ -26,6 +28,7 @@
import org.apache.hadoop.crypto.CipherSuite;
import org.apache.hadoop.crypto.CryptoProtocolVersion;
import org.apache.hadoop.fs.FileEncryptionInfo;
+import org.apache.hadoop.hdds.ComponentVersion;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -43,7 +46,7 @@
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
-import org.apache.hadoop.ozone.om.upgrade.OMLayoutVersionManager;
+import org.apache.hadoop.ozone.om.upgrade.OMVersionManager;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
import org.apache.hadoop.util.Time;
@@ -203,7 +206,7 @@ public void testListStatusResponseSize(int resultSize) throws IOException {
.collect(Collectors.toList());
OzoneManagerRequestHandler requestHandler = getRequestHandler(10);
OzoneManager ozoneManager = requestHandler.getOzoneManager();
- Mockito.when(ozoneManager.listStatus(Mockito.any(OmKeyArgs.class), Mockito.anyBoolean(), Mockito.anyString(),
+ Mockito.when(ozoneManager.listStatus(any(OmKeyArgs.class), Mockito.anyBoolean(), Mockito.anyString(),
Mockito.anyLong(), Mockito.anyBoolean())).thenAnswer(i -> {
long maxSize = i.getArgument(3);
maxSize = Math.max(Math.min(resultSize, maxSize), 0);
@@ -320,8 +323,8 @@ public void testSnapshotDiffRoutingUsesCorrectServerMethodBasedOnOptionalFlags()
OzoneManagerRequestHandler handler = getRequestHandler(10);
OzoneManager ozoneManager = handler.getOzoneManager();
- OMLayoutVersionManager lvm = Mockito.mock(OMLayoutVersionManager.class);
- Mockito.when(lvm.isAllowed(Mockito.anyString())).thenReturn(true);
+ OMVersionManager lvm = Mockito.mock(OMVersionManager.class);
+ Mockito.when(lvm.isAllowed(any(ComponentVersion.class))).thenReturn(true);
Mockito.when(ozoneManager.getVersionManager()).thenReturn(lvm);
Mockito.when(ozoneManager.snapshotDiff(Mockito.anyString(), Mockito.anyString(),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org