9e2936f8d1
(cherry picked from commit 1a205cc3adffa568c814a5241e041b08e2fcd3eb) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracing.java Co-authored-by: Siyao Meng <50227127+smengcl@users.noreply.github.com>