Details
Description
HDFS-14476, HDFS-14751 and HDFS-15048 made some good improvements to the datanode DirectoryScanner, but due to a large refactor on that class in branch-3.3, they are not trivial to backport to earlier branches.
HDFS-14476 introduced the problem in HDFS-14751 and a findbugs warning, fixed in HDFS-15048, so these 3 need to be backported together.