[hadoop] branch branch-2.10 updated: HDFS-11041. Unable to unregister FsDatasetState MBean if DataNode is shutdown twice. Contributed by Wei-Chiu Chuang.

[weichiu]

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

weichiu pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new f36d61a  HDFS-11041. Unable to unregister FsDatasetState MBean if 
DataNode is shutdown twice. Contributed by Wei-Chiu Chuang.
f36d61a is described below

commit f36d61a0c2ae732ea4e6b1e8762a5082b0d1cbf7
Author: Ayush Saxena <ayushsax...@apache.org>
AuthorDate: Wed Jun 3 12:47:15 2020 +0530

    HDFS-11041. Unable to unregister FsDatasetState MBean if DataNode is 
shutdown twice. Contributed by Wei-Chiu Chuang.
    
    (cherry picked from commit e8cb2ae409bc1d62f23efef485d1c6f1ff21e86c)
    (cherry picked from commit fa30224e95d920adaea0ec65c360359044e3f754)
    (cherry picked from commit 551f8d3ddc674d94343eacd63f11ce95564c7138)
---
 .../hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java    | 1 +
 .../org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
index 9977b96..81b0d67 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
@@ -2410,6 +2410,7 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> 
{
 
     if (mbeanName != null) {
       MBeans.unregister(mbeanName);
+      mbeanName = null;
     }
 
     if (asyncDiskService != null) {
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
index a36a9a2..b4526fb 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
@@ -1318,7 +1318,10 @@ public class SimulatedFSDataset implements 
FsDatasetSpi<FsVolumeSpi> {
 
   @Override
   public void shutdown() {
-    if (mbeanName != null) MBeans.unregister(mbeanName);
+    if (mbeanName != null) {
+      MBeans.unregister(mbeanName);
+      mbeanName = null;
+    }
   }
 
   @Override

---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org