HDFS-17566. Got wrong sorted block order when StorageType is considered. (#6934). Contributed by Chenyu Zheng.

Signed-off-by: He Xiaoqiao <hexiaoqiao@apache.org>

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);