[incubator-uniffle] branch master updated: [#483] test: fix flaky test ShuffleServerFaultToleranceTest (#705)

[ro...@apache.org]

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

roryqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git


The following commit(s) were added to refs/heads/master by this push:
     new 29ff35b3 [#483] test: fix flaky test ShuffleServerFaultToleranceTest (#705)
29ff35b3 is described below

commit 29ff35b3e05be164bb1c86f8e834ce03e6db00b4
Author: roryqi <ro...@apache.org>
AuthorDate: Sat Mar 11 00:06:36 2023 +0800

    [#483] test: fix flaky test ShuffleServerFaultToleranceTest (#705)
    
    ### What changes were proposed in this pull request?
    I see the log `server unavailable`. but there is no `bind port error`. I change the ports that we use. I run four times. #483 won't happen.
    
    ### Why are the changes needed?
    Fix: #483
    
    ### Does this PR introduce _any_ user-facing change?
    No.
    
    ### How was this patch tested?
    run CI 4 times.
---
 .../main/java/org/apache/uniffle/common/config/ReconfigurableBase.java  | 2 +-
 .../java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/org/apache/uniffle/common/config/ReconfigurableBase.java b/common/src/main/java/org/apache/uniffle/common/config/ReconfigurableBase.java
index 7f0fa978..d917a8ea 100644
--- a/common/src/main/java/org/apache/uniffle/common/config/ReconfigurableBase.java
+++ b/common/src/main/java/org/apache/uniffle/common/config/ReconfigurableBase.java
@@ -52,7 +52,7 @@ public abstract class ReconfigurableBase implements Reconfigurable {
   }
 
   public void stopReconfigureThread() {
-    scheduledExecutorService.shutdown();
+    scheduledExecutorService.shutdownNow();
   }
 
   private void checkConfiguration() {
diff --git a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java
index 5b12e9ac..67a20429 100644
--- a/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java
+++ b/integration-test/common/src/test/java/org/apache/uniffle/test/ShuffleServerFaultToleranceTest.java
@@ -244,7 +244,7 @@ public class ShuffleServerFaultToleranceTest extends ShuffleReadWriteBase {
     String basePath = dataDir1.getAbsolutePath() + "," + dataDir2.getAbsolutePath();
     shuffleServerConf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.MEMORY_LOCALFILE_HDFS.name());
     shuffleServerConf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 450L);
-    shuffleServerConf.setInteger("rss.rpc.server.port", SHUFFLE_SERVER_PORT + id);
+    shuffleServerConf.setInteger("rss.rpc.server.port", SHUFFLE_SERVER_PORT + 20 + id);
     shuffleServerConf.setInteger("rss.jetty.http.port", 19081 + id * 100);
     shuffleServerConf.setString("rss.storage.basePath", basePath);
     return new MockedShuffleServer(shuffleServerConf);