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 b8faba6b87 HDDS-10643. Avoid terminating SCM by statemachine during
normal SCM stop. (#6478)
b8faba6b87 is described below
commit b8faba6b87513d8a400cfdf5c13feca25a912c0b
Author: Ashish Kumar <[email protected]>
AuthorDate: Mon Apr 8 20:52:25 2024 +0530
HDDS-10643. Avoid terminating SCM by statemachine during normal SCM stop.
(#6478)
Co-authored-by: ashishk <[email protected]>
---
.../src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java | 2 +-
.../org/apache/hadoop/hdds/scm/server/StorageContainerManager.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
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 a5583b48b1..9d9bf07fda 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
@@ -440,7 +440,7 @@ public class SCMStateMachine extends BaseStateMachine {
transactionBuffer.close();
HadoopExecutors.
shutdown(installSnapshotExecutor, LOG, 5, TimeUnit.SECONDS);
- } else {
+ } else if (!scm.isStopped()) {
scm.shutDown("scm statemachine is closed by ratis, terminate SCM");
}
}
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 c6b809874c..fa67dd68de 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
@@ -1796,6 +1796,10 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
ExitUtils.terminate(0, message, LOG);
}
+ public boolean isStopped() {
+ return isStopped.get();
+ }
+
/**
* Wait until service has completed shutdown.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
