This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 0e516947c4e HDDS-15369. Fix datanode shutdown on ozone.scm.nodes
reconfig (#10358)
0e516947c4e is described below
commit 0e516947c4ebd76f7a2a23349a19a96a15323cd9
Author: XiChen <[email protected]>
AuthorDate: Tue May 26 22:28:06 2026 +0800
HDDS-15369. Fix datanode shutdown on ozone.scm.nodes reconfig (#10358)
---
.../common/statemachine/SCMConnectionManager.java | 5 ++-
.../statemachine/TestSCMConnectionManager.java | 49 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java
index 27d31c90fe6..c7273dca741 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java
@@ -44,7 +44,6 @@
import org.apache.hadoop.ipc_.RPC;
import org.apache.hadoop.metrics2.util.MBeans;
import org.apache.hadoop.net.NetUtils;
-import
org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine.EndPointStates;
import org.apache.hadoop.ozone.protocolPB.ReconDatanodeProtocolPB;
import
org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolClientSideTranslatorPB;
import org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolPB;
@@ -234,7 +233,9 @@ public void removeSCMServer(InetSocketAddress address)
throws IOException {
"Ignoring the request.");
return;
}
- endPoint.setState(EndPointStates.SHUTDOWN);
+ // This is a normal reconfiguration removal. Do not set the endpoint to
+ // SHUTDOWN, as an in-flight task may report that state as a DN fatal
+ // shutdown.
endPoint.close();
} finally {
writeUnlock();
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/TestSCMConnectionManager.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/TestSCMConnectionManager.java
new file mode 100644
index 00000000000..12e62ffe733
--- /dev/null
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/TestSCMConnectionManager.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.container.common.statemachine;
+
+import static
org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine.EndPointStates.HEARTBEAT;
+
+import java.net.InetSocketAddress;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests for SCMConnectionManager.
+ */
+public class TestSCMConnectionManager {
+
+ @Test
+ public void testRemoveSCMServerDoesNotMarkEndpointShutdown()
+ throws Exception {
+ try (SCMConnectionManager connectionManager =
+ new SCMConnectionManager(new OzoneConfiguration())) {
+ InetSocketAddress address = new InetSocketAddress("127.0.0.1", 9861);
+ connectionManager.addSCMServer(address, "");
+ EndpointStateMachine endpoint =
+ connectionManager.getValues().iterator().next();
+ endpoint.setState(HEARTBEAT);
+
+ connectionManager.removeSCMServer(address);
+
+ Assertions.assertTrue(connectionManager.getValues().isEmpty());
+ Assertions.assertEquals(HEARTBEAT, endpoint.getState());
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
