HDFS-5932: code review feedback