Repository: hadoop Updated Branches: refs/heads/HDFS-7240 c29aff44c -> 31bbae96c
HDFS-12426. Ozone: BlockManager MBean unregister failure upon shutdown. Contributed by Lokesh Jain. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/31bbae96 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/31bbae96 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/31bbae96 Branch: refs/heads/HDFS-7240 Commit: 31bbae96c57da1059b5e90c1d188025c6a3bcb2c Parents: c29aff4 Author: Xiaoyu Yao <[email protected]> Authored: Thu Sep 14 14:54:16 2017 -0700 Committer: Xiaoyu Yao <[email protected]> Committed: Thu Sep 14 14:54:16 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/31bbae96/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java index 472dc7d..23b1c8b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/block/BlockManagerImpl.java @@ -105,7 +105,7 @@ public class BlockManagerImpl implements BlockManager, BlockmanagerMXBean { Map<String, BlockContainerInfo>> containers; private final int containerProvisionBatchSize; private final Random rand; - private final ObjectName mxBean; + private ObjectName mxBean; /** @@ -588,7 +588,10 @@ public class BlockManagerImpl implements BlockManager, BlockmanagerMXBean { deletedBlockLog.close(); } blockDeletingService.shutdown(); - MBeans.unregister(mxBean); + if (mxBean != null) { + MBeans.unregister(mxBean); + mxBean = null; + } } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
