[dolphinscheduler] branch dev updated: [Improvement][Master] LowerWeightRoundRobin doSelect may be null (#12159)

[wenjun]

This is an automated email from the ASF dual-hosted git repository.

wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 55388be21f [Improvement][Master] LowerWeightRoundRobin doSelect may be 
null (#12159)
55388be21f is described below

commit 55388be21fa766806a90b39229e1a57a59a5414c
Author: xuhhui <szh...@163.com>
AuthorDate: Fri Sep 30 20:00:23 2022 +0800

    [Improvement][Master] LowerWeightRoundRobin doSelect may be null (#12159)
---
 .../dispatch/host/assign/LowerWeightRoundRobin.java       | 10 +++++++++-
 .../dispatch/host/assign/LowerWeightRoundRobinTest.java   | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobin.java
 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobin.java
index f099d81473..3388129b2a 100644
--- 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobin.java
+++ 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobin.java
@@ -18,10 +18,13 @@
 package org.apache.dolphinscheduler.server.master.dispatch.host.assign;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.springframework.util.CollectionUtils;
+
 import com.google.common.collect.Lists;
 
 /**
@@ -49,11 +52,16 @@ public class LowerWeightRoundRobin extends 
AbstractSelector<HostWeight> {
                 lowWeight = hostWeight.getCurrentWeight();
             }
         }
-        lowerNode.setCurrentWeight(lowerNode.getCurrentWeight() + totalWeight);
+        if (lowerNode != null) {
+            lowerNode.setCurrentWeight(lowerNode.getCurrentWeight() + 
totalWeight);
+        }
         return lowerNode;
     }
 
     private List<HostWeight> canAssignTaskHost(Collection<HostWeight> sources) 
{
+        if (CollectionUtils.isEmpty(sources)) {
+            return Collections.emptyList();
+        }
         List<HostWeight> zeroWaitingTask = sources.stream().filter(h -> 
h.getWaitingTaskCount() == 0).collect(Collectors.toList());
         if (!zeroWaitingTask.isEmpty()) {
             return zeroWaitingTask;
diff --git 
a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobinTest.java
 
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobinTest.java
index fcb8fbc541..e2ff180ba3 100644
--- 
a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobinTest.java
+++ 
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/LowerWeightRoundRobinTest.java
@@ -72,4 +72,19 @@ public class LowerWeightRoundRobinTest {
         result = roundRobin.select(sources);
         Assert.assertEquals("192.158.2.1", result.getHost().getIp());
     }
+
+    @Test
+    public void testDoSelect() {
+        Collection<HostWeight> sources = new ArrayList<>();
+        LowerWeightRoundRobin roundRobin = new LowerWeightRoundRobin();
+        HostWeight result;
+        result = roundRobin.doSelect(sources);
+        Assert.assertEquals(null, result);
+
+        sources.add(new HostWeight(HostWorker.of("192.158.2.1:11", 100, 
"default"), 0.06, 0.44, 3.14, 1, System.currentTimeMillis() - 60 * 8 * 1000));
+        sources.add(new HostWeight(HostWorker.of("192.158.2.2:22", 100, 
"default"), 0.06, 0.56, 3.24, 2, System.currentTimeMillis() - 60 * 5 * 1000));
+        sources.add(new HostWeight(HostWorker.of("192.158.2.3:33", 100, 
"default"), 0.06, 0.80, 3.15, 1, System.currentTimeMillis() - 60 * 2 * 1000));
+        result = roundRobin.doSelect(sources);
+        Assert.assertEquals("192.158.2.1", result.getHost().getIp());
+    }
 }