Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 03049290fe8ef1459a3c8bd05cf198320e6e4973) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNNStorageRetentionManager.java