HDDS-514. Clean Unregister JMX upon SCMConnectionManager#close. Contributed by Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/524f7cd3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/524f7cd3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/524f7cd3 Branch: refs/heads/YARN-1011 Commit: 524f7cd354e0683c9ec61fdbce344ef79b841728 Parents: 096a716 Author: Anu Engineer <[email protected]> Authored: Thu Sep 20 12:21:34 2018 -0700 Committer: Anu Engineer <[email protected]> Committed: Thu Sep 20 12:21:34 2018 -0700 ---------------------------------------------------------------------- .../container/common/statemachine/SCMConnectionManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/524f7cd3/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/SCMConnectionManager.java ---------------------------------------------------------------------- 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 85fb580..775a91a 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 @@ -59,7 +59,7 @@ public class SCMConnectionManager private final int rpcTimeout; private final Configuration conf; - private final ObjectName jmxBean; + private ObjectName jmxBean; public SCMConnectionManager(Configuration conf) { this.mapLock = new ReentrantReadWriteLock(); @@ -191,7 +191,10 @@ public class SCMConnectionManager public void close() throws IOException { getValues().forEach(endpointStateMachine -> IOUtils.cleanupWithLogger(LOG, endpointStateMachine)); - MBeans.unregister(jmxBean); + if (jmxBean != null) { + MBeans.unregister(jmxBean); + jmxBean = null; + } } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
