You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2020/11/14 06:59:31 UTC
[incubator-dolphinscheduler] branch dev updated:
[FIX_BUG][server-test] dismiss of server warm-up time in
RoundRobinSelectorTest (#4067)
This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 8a92105 [FIX_BUG][server-test] dismiss of server warm-up time in RoundRobinSelectorTest (#4067)
8a92105 is described below
commit 8a92105f674d02047bde929b3126f583f19a5173
Author: Kirs <ac...@163.com>
AuthorDate: Sat Nov 14 14:59:20 2020 +0800
[FIX_BUG][server-test] dismiss of server warm-up time in RoundRobinSelectorTest (#4067)
---
.../host/assign/RoundRobinSelectorTest.java | 77 ++++++++--------------
1 file changed, 27 insertions(+), 50 deletions(-)
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/RoundRobinSelectorTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/RoundRobinSelectorTest.java
index 31eac07..1c9f492 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/RoundRobinSelectorTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/RoundRobinSelectorTest.java
@@ -23,7 +23,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
-import java.util.Collections;
+import java.util.List;
/**
* round robin selector
@@ -39,82 +39,59 @@ public class RoundRobinSelectorTest {
@Test
public void testSelect1() {
RoundRobinSelector selector = new RoundRobinSelector();
+ // dismiss of server warm-up time
+ long startTime = System.currentTimeMillis() - 60 * 10 * 1000;
+ List<Host> hostOneList = Arrays.asList(
+ new Host("192.168.1.1", 80, 20, startTime, "kris"),
+ new Host("192.168.1.2", 80, 10, startTime, "kris"));
+
+ List<Host> hostTwoList = Arrays.asList(
+ new Host("192.168.1.1", 80, 20, startTime, "kris"),
+ new Host("192.168.1.2", 80, 10, startTime, "kris"),
+ new Host("192.168.1.3", 80, 10, startTime, "kris"));
+
Host result;
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostOneList);
Assert.assertEquals("192.168.1.1", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostOneList);
Assert.assertEquals("192.168.1.2", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostOneList);
Assert.assertEquals("192.168.1.1", result.getIp());
- // add new host
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostOneList);
Assert.assertEquals("192.168.1.1", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostOneList);
Assert.assertEquals("192.168.1.2", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.3", 80, 10, System.currentTimeMillis(), "kris")));
+ // add new host
+ result = selector.select(hostTwoList);
Assert.assertEquals("192.168.1.1", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.3", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostTwoList);
Assert.assertEquals("192.168.1.3", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.3", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostTwoList);
Assert.assertEquals("192.168.1.1", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.3", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostTwoList);
Assert.assertEquals("192.168.1.2", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.3", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostTwoList);
Assert.assertEquals("192.168.1.1", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.3", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostTwoList);
Assert.assertEquals("192.168.1.3", result.getIp());
// remove host3
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostOneList);
Assert.assertEquals("192.168.1.1", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostOneList);
Assert.assertEquals("192.168.1.2", result.getIp());
- result = selector.select(Arrays.asList(
- new Host("192.168.1.1", 80, 20, System.currentTimeMillis(), "kris"),
- new Host("192.168.1.2", 80, 10, System.currentTimeMillis(), "kris")));
+ result = selector.select(hostOneList);
Assert.assertEquals("192.168.1.1", result.getIp());
}