big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-17098. DatanodeManager does not handle null storage type properly. (#6840). Contributed by ConfX.

Browse Source 
Signed-off-by: Shilun Fan <slfan1989@apache.org>
This commit is contained in:
Hexiaoqiao 2024-06-19 20:58:57 +08:00 committed by GitHub
parent 56c8aa5f1c
commit 6545b7eeef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
View File

@ -678,7 +678,15 @@ private Consumer<List<DatanodeInfoWithStorage>> createSecondaryNodeSorter() {
Consumer<List<DatanodeInfoWithStorage>> secondarySort = null; Consumer<List<DatanodeInfoWithStorage>> secondarySort = null;
if (readConsiderStorageType) { if (readConsiderStorageType) {
Comparator<DatanodeInfoWithStorage> comp = 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); secondarySort = list -> Collections.sort(list, comp);
} }
if (readConsiderLoad) { if (readConsiderLoad) {