Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit c6539e3289711d29f508930bbda40302f48ddf4c) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java Co-authored-by: Ayush Saxena <ayushsaxena@apache.org>