From 6859f8110f3f58f94792e201cb64852204842b67 Mon Sep 17 00:00:00 2001 From: Ahoo Wang Date: Sat, 25 Nov 2023 21:50:19 +0800 Subject: [PATCH 1/5] fix: CI test. --- .../cosid/test/machine/distributor/DistributeSafeGuard.java | 2 +- .../java/me/ahoo/cosid/test/machine/distributor/Guard.java | 4 +++- .../test/machine/distributor/MachineIdDistributorSpec.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java index 8ad3cc5002..2c2985e696 100644 --- a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java +++ b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java @@ -72,7 +72,7 @@ public void verify() { /* * 等待所有实例到达安全守护点(SafeGuardAt)，即变成可回收状态. */ - LockSupport.parkNanos(this, safeGuardDuration.plusMillis(10).toNanos()); + LockSupport.parkNanos(this, safeGuardDuration.plusMillis(100).toNanos()); availableInstances = allInstances.subList(endIdx, MachineIdDistributor.totalMachineIds(moreMachineBit)); Integer[] machineIds = availableInstances diff --git a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/Guard.java b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/Guard.java index 842f2e0a8f..626a0a7e3d 100644 --- a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/Guard.java +++ b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/Guard.java @@ -22,6 +22,7 @@ import me.ahoo.cosid.test.MockIdGenerator; import me.ahoo.cosid.test.TestSpec; +import java.util.concurrent.ThreadLocalRandom; import java.util.function.Supplier; /** @@ -42,7 +43,8 @@ public Guard(Supplier implFactory, int machineBit) { public void verify() { MachineIdDistributor distributor = implFactory.get(); String namespace = MockIdGenerator.usePrefix("Guard").generateAsString(); - InstanceId instanceId = mockInstance(0, false); + int port = ThreadLocalRandom.current().nextInt(0, 65535); + InstanceId instanceId = mockInstance(port, false); int machineId = distributor.distribute(namespace, machineBit, instanceId, MachineIdDistributor.FOREVER_SAFE_GUARD_DURATION).getMachineId(); assertThat(machineId, equalTo(0)); distributor.guard(namespace, instanceId, MachineIdDistributor.FOREVER_SAFE_GUARD_DURATION); diff --git a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/MachineIdDistributorSpec.java b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/MachineIdDistributorSpec.java index 10ad224ee2..9cc526d7c5 100644 --- a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/MachineIdDistributorSpec.java +++ b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/MachineIdDistributorSpec.java @@ -30,7 +30,7 @@ public abstract class MachineIdDistributorSpec { public static final String TEST_HOST = "127.0.0.1"; private static final int TEST_MACHINE_BIT = 5; - private static final Duration TEST_SAFE_GUARD_DURATION = Duration.ofSeconds(5); + private static final Duration TEST_SAFE_GUARD_DURATION = Duration.ofSeconds(2); protected static InstanceId mockInstance(int port, boolean stable) { return InstanceId.of(TEST_HOST, port, stable); From 68194b50c1ef11a55efec20c33bec8c67f4c7289 Mon Sep 17 00:00:00 2001 From: Ahoo Wang Date: Sat, 25 Nov 2023 22:04:31 +0800 Subject: [PATCH 2/5] fix: CI test. --- .../cosid/mongo/MongoMachineIdDistributorTest.java | 9 +-------- .../mongo/MongoReactiveMachineIdDistributorTest.java | 11 ++--------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoMachineIdDistributorTest.java b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoMachineIdDistributorTest.java index 79b8b18a4a..50eb9b5539 100644 --- a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoMachineIdDistributorTest.java +++ b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoMachineIdDistributorTest.java @@ -44,12 +44,5 @@ void setup() { protected MachineIdDistributor getDistributor() { return machineIdDistributor; } - - @Override - protected Duration getSafeGuardDuration() { - if (System.getenv().containsKey("CI")) { - return Duration.ofSeconds(10); - } - return super.getSafeGuardDuration(); - } + } \ No newline at end of file diff --git a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoReactiveMachineIdDistributorTest.java b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoReactiveMachineIdDistributorTest.java index f869b37b4d..4a026d5d53 100644 --- a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoReactiveMachineIdDistributorTest.java +++ b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoReactiveMachineIdDistributorTest.java @@ -33,7 +33,7 @@ class MongoReactiveMachineIdDistributorTest extends MachineIdDistributorSpec { @BeforeEach void setup() { - mongoDatabase = MongoClients.create(MongoLauncher.getConnectionString()).getDatabase("cosid_db"); + mongoDatabase = MongoClients.create(MongoLauncher.getConnectionString()).getDatabase("cosid_db_reactive"); machineInitializer = new MongoReactiveMachineInitializer(mongoDatabase); machineInitializer.ensureMachineCollection(); machineIdDistributor = new MongoMachineIdDistributor( @@ -46,12 +46,5 @@ void setup() { protected MachineIdDistributor getDistributor() { return machineIdDistributor; } - - @Override - protected Duration getSafeGuardDuration() { - if (System.getenv().containsKey("CI")) { - return Duration.ofSeconds(10); - } - return super.getSafeGuardDuration(); - } + } \ No newline at end of file From f4dd1e9eb9f11d392dc65e0c3fca339f9f765fa4 Mon Sep 17 00:00:00 2001 From: Ahoo Wang Date: Sat, 25 Nov 2023 22:16:54 +0800 Subject: [PATCH 3/5] fix: CI test. --- .../cosid/test/machine/distributor/DistributeSafeGuard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java index 2c2985e696..e8e2d69acf 100644 --- a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java +++ b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java @@ -72,7 +72,7 @@ public void verify() { /* * 等待所有实例到达安全守护点(SafeGuardAt)，即变成可回收状态. */ - LockSupport.parkNanos(this, safeGuardDuration.plusMillis(100).toNanos()); + LockSupport.parkNanos(this, safeGuardDuration.plusMillis(200).toNanos()); availableInstances = allInstances.subList(endIdx, MachineIdDistributor.totalMachineIds(moreMachineBit)); Integer[] machineIds = availableInstances From 1ea7bb37b7d881df86708af2787e89dd8b5f726a Mon Sep 17 00:00:00 2001 From: Ahoo Wang Date: Sat, 25 Nov 2023 22:37:31 +0800 Subject: [PATCH 4/5] fix: CI test. --- .../cosid/test/machine/distributor/DistributeSafeGuard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java index e8e2d69acf..10c764754c 100644 --- a/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java +++ b/cosid-test/src/main/java/me/ahoo/cosid/test/machine/distributor/DistributeSafeGuard.java @@ -72,7 +72,7 @@ public void verify() { /* * 等待所有实例到达安全守护点(SafeGuardAt)，即变成可回收状态. */ - LockSupport.parkNanos(this, safeGuardDuration.plusMillis(200).toNanos()); + LockSupport.parkNanos(this, safeGuardDuration.plusMillis(300).toNanos()); availableInstances = allInstances.subList(endIdx, MachineIdDistributor.totalMachineIds(moreMachineBit)); Integer[] machineIds = availableInstances From ba920936b9eaedc193bff298d5f9866d5533237f Mon Sep 17 00:00:00 2001 From: Ahoo Wang Date: Sat, 25 Nov 2023 22:42:22 +0800 Subject: [PATCH 5/5] fix: CI test. --- .../src/test/java/me/ahoo/cosid/mongo/MongoLauncher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoLauncher.java b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoLauncher.java index 8a7dbb2e52..d34ac016cf 100644 --- a/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoLauncher.java +++ b/cosid-mongo/src/test/java/me/ahoo/cosid/mongo/MongoLauncher.java @@ -20,7 +20,7 @@ public class MongoLauncher { private static final String DEV_CONNECTION_STRING = "mongodb://root:root@localhost"; - private static final MongoDBContainer MONGO_CONTAINER = new MongoDBContainer(DockerImageName.parse("mongo:4.0.10")) + private static final MongoDBContainer MONGO_CONTAINER = new MongoDBContainer(DockerImageName.parse("mongo:5.0.8")) .withNetworkAliases("mongo") .withReuse(true);