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 6545b7eeef1 HDFS-17098. DatanodeManager does not handle null storage
type properly. (#6840). Contributed by ConfX.
6545b7eeef1 is described below
commit 6545b7eeef1ccbba526c771a6ab7da2f374a1e0b
Author: Hexiaoqiao <hexiaoq...@apache.org>
AuthorDate: Wed Jun 19 20:58:57 2024 +0800
HDFS-17098. DatanodeManager does not handle null storage type properly.
(#6840). Contributed by ConfX.
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
.../hadoop/hdfs/server/blockmanagement/DatanodeManager.java | 10 +++++++++-
1 file changed, 9 insertions(+), 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 b3eb2fd7f97..a46a2ce15c6 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
@@ -678,7 +678,15 @@ public class DatanodeManager {
Consumer<List<DatanodeInfoWithStorage>> secondarySort = null;
if (readConsiderStorageType) {
Comparator<DatanodeInfoWithStorage> comp =
- Comparator.comparing(DatanodeInfoWithStorage::getStorageType);
+ Comparator.comparing(DatanodeInfoWithStorage::getStorageType, (s1,
s2) -> {
+ if (s1 == null) {
+ return (s2 == null) ? 0 : -1;
+ } else if (s2 == null) {
+ return 1;
+ } else {
+ return s2.compareTo(s1);
+ }
+ });
secondarySort = list -> Collections.sort(list, comp);
}
if (readConsiderLoad) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
