From efd894dc6c9752c54c08fe37ab82db2bc3197870 Mon Sep 17 00:00:00 2001 From: baoloongmao Date: Sun, 5 Jan 2025 12:13:46 +0800 Subject: [PATCH 1/3] Fix flaky test for CoordinatorReconfigureNodeMaxTest#testReconfigureNodeMax --- .../apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java index 4eb10caa08..adbebac3ad 100644 --- a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java +++ b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java @@ -131,9 +131,11 @@ public void testReconfigureNodeMax() throws Exception { assertEquals(5, info.getServerToPartitionRanges().keySet().size()); // case3: recover its value to 10 + Thread.sleep(1000L); try (FileWriter fileWriter = new FileWriter(tempConfFilePath)) { fileWriter.append(CoordinatorConf.COORDINATOR_SHUFFLE_NODES_MAX.key() + " " + 10); } + Thread.sleep(1000L); Awaitility.await().timeout(2, TimeUnit.SECONDS).until(() -> nodeMax.get() == 10); info = shuffleWriteClient.getShuffleAssignments("app1", 0, 10, 1, TAGS, SERVER_NUM + 10, -1); assertEquals(10, info.getServerToPartitionRanges().keySet().size()); From 39ee7905846d29d3baba104af46ca5c22d1703a5 Mon Sep 17 00:00:00 2001 From: baoloongmao Date: Wed, 8 Jan 2025 09:46:36 +0800 Subject: [PATCH 2/3] Add comment --- .../apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java index adbebac3ad..ec4796c730 100644 --- a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java +++ b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java @@ -131,11 +131,11 @@ public void testReconfigureNodeMax() throws Exception { assertEquals(5, info.getServerToPartitionRanges().keySet().size()); // case3: recover its value to 10 + // Make sure last modification time change Thread.sleep(1000L); try (FileWriter fileWriter = new FileWriter(tempConfFilePath)) { fileWriter.append(CoordinatorConf.COORDINATOR_SHUFFLE_NODES_MAX.key() + " " + 10); } - Thread.sleep(1000L); Awaitility.await().timeout(2, TimeUnit.SECONDS).until(() -> nodeMax.get() == 10); info = shuffleWriteClient.getShuffleAssignments("app1", 0, 10, 1, TAGS, SERVER_NUM + 10, -1); assertEquals(10, info.getServerToPartitionRanges().keySet().size()); From 37759d301e3dd7f52a608005adb9f21143358b56 Mon Sep 17 00:00:00 2001 From: baoloongmao Date: Thu, 9 Jan 2025 09:43:27 +0800 Subject: [PATCH 3/3] try to reduce wait time --- .../uniffle/test/CoordinatorReconfigureNodeMaxTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java index ec4796c730..d79fd67d81 100644 --- a/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java +++ b/integration-test/common/src/test/java/org/apache/uniffle/test/CoordinatorReconfigureNodeMaxTest.java @@ -132,7 +132,12 @@ public void testReconfigureNodeMax() throws Exception { // case3: recover its value to 10 // Make sure last modification time change - Thread.sleep(1000L); + File tempConfFile = new File(tempConfFilePath); + long currentTime = System.currentTimeMillis(); + if (currentTime - tempConfFile.lastModified() < 1000) { + Thread.sleep(1000 - (currentTime - tempConfFile.lastModified())); + } + try (FileWriter fileWriter = new FileWriter(tempConfFilePath)) { fileWriter.append(CoordinatorConf.COORDINATOR_SHUFFLE_NODES_MAX.key() + " " + 10); }