This is an automated email from the ASF dual-hosted git repository.
sumitagrawal 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 a3a3286d129 HDDS-13980. SCM start DN protocol server during startup
(#9350)
a3a3286d129 is described below
commit a3a3286d12934143f6764ffb3de637006b6695a7
Author: Sumit Agrawal <[email protected]>
AuthorDate: Tue Dec 2 12:12:44 2025 +0530
HDDS-13980. SCM start DN protocol server during startup (#9350)
---
.../apache/hadoop/hdds/scm/events/SCMEvents.java | 5 ++
.../apache/hadoop/hdds/scm/ha/SCMStateMachine.java | 8 ++-
.../hdds/scm/safemode/SafeModeRuleFactory.java | 13 +++++
.../hdds/scm/safemode/StateMachineReadyRule.java | 68 ++++++++++++++++++++++
.../hdds/scm/server/StorageContainerManager.java | 6 +-
.../client/rpc/TestFailureHandlingByClient.java | 5 ++
6 files changed, 98 insertions(+), 7 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java
index ec24d29c16b..2255fb39259 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/events/SCMEvents.java
@@ -223,6 +223,11 @@ public final class SCMEvents {
public static final TypedEvent<ContainerID>
RECONCILE_CONTAINER = new TypedEvent<>(ContainerID.class,
"Reconcile_Container");
+ /**
+ * This event will be triggered from SCM State Machine when ready.
+ */
+ public static final TypedEvent<Boolean> STATEMACHINE_READY = new
TypedEvent<>(Boolean.class, "STATEMACHINE_READY");
+
/**
* Private Ctor. Never Constructed.
*/
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
index ef9ffc03f26..ecc175639b6 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
@@ -361,15 +361,17 @@ public void notifyTermIndexUpdated(long term, long index)
{
// 1. Refresh Safemode rules state.
// 2. Start DN Rpc server.
if (!refreshedAfterLeaderReady.get()) {
- scm.getScmSafeModeManager().refresh();
- scm.getDatanodeProtocolServer().start();
-
refreshedAfterLeaderReady.set(true);
+ scm.getScmSafeModeManager().refreshAndValidate();
}
currentLeaderTerm.set(-1L);
}
}
+ public boolean isRefreshedAfterLeaderReady() {
+ return refreshedAfterLeaderReady.get();
+ }
+
@Override
public void notifyLeaderReady() {
if (!isInitialized) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SafeModeRuleFactory.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SafeModeRuleFactory.java
index 6bd4dbf6444..398eb19b56e 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SafeModeRuleFactory.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SafeModeRuleFactory.java
@@ -22,8 +22,11 @@
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.scm.container.ContainerManager;
import org.apache.hadoop.hdds.scm.ha.SCMContext;
+import org.apache.hadoop.hdds.scm.ha.SCMHAManager;
import org.apache.hadoop.hdds.scm.node.NodeManager;
import org.apache.hadoop.hdds.scm.pipeline.PipelineManager;
+import org.apache.hadoop.hdds.scm.server.OzoneStorageContainerManager;
+import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.server.events.EventQueue;
/**
@@ -79,6 +82,16 @@ private void loadRules(SCMSafeModeManager safeModeManager) {
preCheckRules.add(datanodeRule);
+ OzoneStorageContainerManager ozoneScm = scmContext.getScm();
+ if (ozoneScm instanceof StorageContainerManager) {
+ StorageContainerManager scm = (StorageContainerManager) ozoneScm;
+ SCMHAManager scmHAManager = scm.getScmHAManager();
+ if (scmHAManager != null && scmHAManager.getRatisServer() != null) {
+ safeModeRules.add(new StateMachineReadyRule(eventQueue,
safeModeManager,
+ scmHAManager.getRatisServer().getSCMStateMachine()));
+ }
+ }
+
if (pipelineManager != null) {
safeModeRules.add(new HealthyPipelineSafeModeRule(eventQueue,
pipelineManager,
safeModeManager, config, scmContext, nodeManager));
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/StateMachineReadyRule.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/StateMachineReadyRule.java
new file mode 100644
index 00000000000..d5724979f30
--- /dev/null
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/StateMachineReadyRule.java
@@ -0,0 +1,68 @@
+/*
+ * 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.hdds.scm.safemode;
+
+import org.apache.hadoop.hdds.scm.events.SCMEvents;
+import org.apache.hadoop.hdds.scm.ha.SCMStateMachine;
+import org.apache.hadoop.hdds.server.events.EventQueue;
+import org.apache.hadoop.hdds.server.events.TypedEvent;
+
+/**
+ * Class defining Safe mode exit when SCM State Machine is ready, ie all
transaction is applied.
+ */
+public class StateMachineReadyRule extends SafeModeExitRule<Boolean> {
+ private SCMStateMachine scmStateMachine = null;
+
+ public StateMachineReadyRule(EventQueue eventQueue, SCMSafeModeManager
manager, SCMStateMachine scmStateMachine) {
+ super(manager, eventQueue);
+ this.scmStateMachine = scmStateMachine;
+ }
+
+ @Override
+ protected TypedEvent<Boolean> getEventType() {
+ return SCMEvents.STATEMACHINE_READY;
+ }
+
+ @Override
+ protected boolean validate() {
+ if (null != scmStateMachine) {
+ return scmStateMachine.isRefreshedAfterLeaderReady();
+ }
+ // if no HA, always return true.
+ return true;
+ }
+
+ @Override
+ protected void process(Boolean ignored) {
+ }
+
+ @Override
+ protected void cleanup() {
+ }
+
+ @Override
+ public String getStatusText() {
+ return String.format("Refreshed SCM State Machine after leader ready: %s",
+ scmStateMachine != null ?
scmStateMachine.isRefreshedAfterLeaderReady() : "NA");
+ }
+
+ @Override
+ public void refresh(boolean forceRefresh) {
+ // Do nothing.
+ }
+}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 7c1f1a420ac..54dbcde5896 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -1532,10 +1532,8 @@ public void start() throws IOException {
}
getBlockProtocolServer().start();
- // If HA is enabled, start datanode protocol server once leader is ready.
- if (!scmStorageConfig.isSCMHAEnabled()) {
- getDatanodeProtocolServer().start();
- }
+ // start datanode protocol server
+ getDatanodeProtocolServer().start();
if (getSecurityProtocolServer() != null) {
getSecurityProtocolServer().start();
persistSCMCertificates();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
index c262b8267f1..f115b3d99ff 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestFailureHandlingByClient.java
@@ -49,6 +49,7 @@
import org.apache.hadoop.net.DNSToSwitchMapping;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.net.StaticMapping;
+import org.apache.hadoop.ozone.HddsDatanodeService;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -68,6 +69,7 @@
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
+import org.apache.ozone.test.GenericTestUtils;
import org.apache.ratis.proto.RaftProtos;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -451,6 +453,9 @@ public void
testDatanodeExclusionWithMajorityCommit(RaftProtos.ReplicationLevel
cluster.shutdownHddsDatanode(datanodes.get(0));
restartDataNodes.add(datanodes.get(0));
+ HddsDatanodeService hddsDatanode =
cluster.getHddsDatanode(datanodes.get(0));
+ GenericTestUtils.waitFor(hddsDatanode::isStopped, 1000, 30000);
+
key.write(data.getBytes(UTF_8));
key.write(data.getBytes(UTF_8));
key.flush();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
