Repository: hadoop Updated Branches: refs/heads/ozone-0.2 7f495ee08 -> 1a9f3380b
HDDS-507. EventQueue should be shutdown on SCM shutdown. Contributed by Xiaoyu Yao. (cherry picked from commit 236d16e3a5611b8ca4f80cb7e8ffd63f167db8e0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a9f3380 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a9f3380 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a9f3380 Branch: refs/heads/ozone-0.2 Commit: 1a9f3380b764d09ecf754d6233e47a9b30bf7bf3 Parents: 7f495ee Author: Nanda kumar <[email protected]> Authored: Thu Sep 20 01:22:18 2018 +0530 Committer: Nanda kumar <[email protected]> Committed: Thu Sep 20 01:22:47 2018 +0530 ---------------------------------------------------------------------- .../hadoop/hdds/scm/server/StorageContainerManager.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a9f3380/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java ---------------------------------------------------------------------- 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 86c061b..b2cbc93 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 @@ -759,6 +759,13 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl } unregisterMXBean(); + // Event queue must be stopped before the DB store is closed at the end. + try { + LOG.info("Stopping SCM Event Queue."); + eventQueue.close(); + } catch (Exception ex) { + LOG.error("SCM Event Queue stop failed", ex); + } IOUtils.cleanupWithLogger(LOG, scmContainerManager); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
