This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8913d379fd2 HDFS-17566. Got wrong sorted block order when StorageType
is considered. (#6934). Contributed by Chenyu Zheng.
8913d379fd2 is described below
commit 8913d379fd2d2d1de548637749d5322377395835
Author: zhengchenyu <zhengcheny...@163.com>
AuthorDate: Thu Jul 11 17:41:24 2024 +0800
HDFS-17566. Got wrong sorted block order when StorageType is considered.
(#6934). Contributed by Chenyu Zheng.
Signed-off-by: He Xiaoqiao <hexiaoq...@apache.org>
---
.../org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index a46a2ce15c6..081f8348258 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -684,7 +684,7 @@ public class DatanodeManager {
} else if (s2 == null) {
return 1;
} else {
- return s2.compareTo(s1);
+ return s1.compareTo(s2);
}
});
secondarySort = list -> Collections.sort(list, comp);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
