You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sa...@apache.org on 2022/10/13 04:50:41 UTC

[ozone] branch master updated: HDDS-7315 SCM order of close of dbstore and other services (#3830)

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

sammichen 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 2bfb6d9ec5 HDDS-7315 SCM order of close of dbstore and other services (#3830)
2bfb6d9ec5 is described below

commit 2bfb6d9ec5a34e06bf78be5a32f0be6db6066193
Author: Sumit Agrawal <su...@gmail.com>
AuthorDate: Thu Oct 13 10:20:36 2022 +0530

    HDDS-7315 SCM order of close of dbstore and other services (#3830)
---
 .../hadoop/hdds/scm/server/StorageContainerManager.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 1f06cbb2f8..73a5468c39 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
@@ -1636,13 +1636,6 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
     IOUtils.cleanupWithLogger(LOG, containerManager);
     IOUtils.cleanupWithLogger(LOG, pipelineManager);
 
-    try {
-      LOG.info("Stopping SCM MetadataStore.");
-      scmMetadataStore.stop();
-    } catch (Exception ex) {
-      LOG.error("SCM Metadata store stop failed", ex);
-    }
-
     if (ms != null) {
       ms.stop();
     }
@@ -1650,6 +1643,13 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
     scmSafeModeManager.stop();
     serviceManager.stop();
     RatisDropwizardExports.clear(ratisMetricsMap);
+
+    try {
+      LOG.info("Stopping SCM MetadataStore.");
+      scmMetadataStore.stop();
+    } catch (Exception ex) {
+      LOG.error("SCM Metadata store stop failed", ex);
+    }
   }
 
   @Override


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