HDFS-16443. Fix edge case where DatanodeAdminDefaultMonitor doubly enqueues a DatanodeDescriptor on exception (#3942)

Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 089e06de21)
2022-01-30 23:04:32 -05:00 · 2022-01-30 23:04:32 -05:00 · 7171e2190e
commit 7171e2190e
parent 5e2eac6c41
1 changed files with 1 additions and 0 deletions
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
@ -275,6 +275,7 @@ private void check() {
            + "{}.", dn, e);
        getPendingNodes().add(dn);
        toRemove.add(dn);
+        unhealthyDns.remove(dn);
      } finally {
        iterkey = dn;
      }