From 4116fa0bb6144c988fc8a5291d16d01107e42121 Mon Sep 17 00:00:00 2001 From: "Haiyang.Hu" Date: Thu, 11 Apr 2024 19:36:29 +0800 Subject: [PATCH 1/2] HDFS-17461. Fix spotbugs in PeerCache#getInternal --- .../src/main/java/org/apache/hadoop/hdfs/PeerCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java index a26a518a8395d..1cf6279fda122 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java @@ -155,7 +155,7 @@ public Peer get(DatanodeID dnId, boolean isDomain) { private synchronized Peer getInternal(DatanodeID dnId, boolean isDomain) { List sockStreamList = multimap.get(new Key(dnId, isDomain)); - if (sockStreamList == null) { + if (sockStreamList.isEmpty()) { return null; } From c5e1b9d29fe1f62c1dd40d55c8b4be8c7b77f943 Mon Sep 17 00:00:00 2001 From: "Haiyang.Hu" Date: Fri, 12 Apr 2024 10:14:40 +0800 Subject: [PATCH 2/2] HDFS-17461. Modify patch based on comments --- .../src/main/java/org/apache/hadoop/hdfs/PeerCache.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java index 1cf6279fda122..41578d4d505d7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/PeerCache.java @@ -155,10 +155,6 @@ public Peer get(DatanodeID dnId, boolean isDomain) { private synchronized Peer getInternal(DatanodeID dnId, boolean isDomain) { List sockStreamList = multimap.get(new Key(dnId, isDomain)); - if (sockStreamList.isEmpty()) { - return null; - } - Iterator iter = sockStreamList.iterator(); while (iter.hasNext()) { Value candidate = iter.next();