(celeborn) branch branch-0.4 updated: [CELEBORN-1783][FOLLOWUP][0.4] Compatible with UT

[rexxiong]

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

rexxiong pushed a commit to branch branch-0.4
in repository https://gitbox.apache.org/repos/asf/celeborn.git


The following commit(s) were added to refs/heads/branch-0.4 by this push:
     new 5494cf7f9 [CELEBORN-1783][FOLLOWUP][0.4] Compatible with UT
5494cf7f9 is described below

commit 5494cf7f978e1e654d975e48317f45515720cbcc
Author: Wang, Fei <fwan...@ebay.com>
AuthorDate: Tue Dec 24 11:18:30 2024 +0800

    [CELEBORN-1783][FOLLOWUP][0.4] Compatible with UT
    
    ### What changes were proposed in this pull request?
    
    Compatible with UT for branch-0.4, followup 
https://github.com/apache/celeborn/commit/de436f7151ee4859e4ab62efa41aae3122086506
    
    ### Why are the changes needed?
    
    ### Does this PR introduce _any_ user-facing change?
    
    ### How was this patch tested?
    
    Closes #3024 from turboFei/branch-0.4_ut.
    
    Authored-by: Wang, Fei <fwan...@ebay.com>
    Signed-off-by: Shuang <lvshuang....@alibaba-inc.com>
---
 .../tests/client/LifecycleManagerCommitFilesSuite.scala     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerCommitFilesSuite.scala
 
b/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerCommitFilesSuite.scala
index 7ccf6c74a..e523fd13a 100644
--- 
a/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerCommitFilesSuite.scala
+++ 
b/tests/spark-it/src/test/scala/org/apache/celeborn/tests/client/LifecycleManagerCommitFilesSuite.scala
@@ -155,11 +155,16 @@ class LifecycleManagerCommitFilesSuite extends 
WithShuffleClientSuite with MiniC
     }
     celebornConf
       .set(CelebornConf.CLIENT_PUSH_REPLICATE_ENABLED.key, "false")
+    val masterConf = Map(
+      "celeborn.master.host" -> "localhost",
+      "celeborn.master.port" -> masterPort.toString,
+      "celeborn.master.endpoints" -> s"localhost:$masterPort")
     val workerConf0 = Map(
       s"${CelebornConf.WORKER_SHUFFLE_COMMIT_TIMEOUT.key}" -> "100",
       s"${CelebornConf.WORKER_COMMIT_THREADS.key}" -> "1",
-      s"${CelebornConf.TEST_MOCK_COMMIT_FILES_FAILURE.key}" -> "true")
-    val (master, _) = setupMiniClusterWithRandomPorts(workerConf = workerConf0)
+      s"${CelebornConf.TEST_MOCK_COMMIT_FILES_FAILURE.key}" -> "true",
+      "celeborn.master.endpoints" -> s"localhost:$masterPort")
+    val (master, _) = setUpMiniCluster(masterConf = masterConf, workerConf = 
workerConf0)
     celebornConf.set(
       CelebornConf.MASTER_ENDPOINTS.key,
       master.conf.get(CelebornConf.MASTER_ENDPOINTS.key))
@@ -176,7 +181,7 @@ class LifecycleManagerCommitFilesSuite extends 
WithShuffleClientSuite with MiniC
     assert(res.status == StatusCode.SUCCESS)
 
     lifecycleManager.setupEndpoints(
-      res.workerResource.keySet(),
+      res.workerResource,
       shuffleId,
       new ShuffleFailedWorkers())
 
@@ -186,7 +191,7 @@ class LifecycleManagerCommitFilesSuite extends 
WithShuffleClientSuite with MiniC
       res.workerResource,
       updateEpoch = false)
 
-    lifecycleManager.commitManager.registerShuffle(shuffleId, 1, false)
+    lifecycleManager.commitManager.registerShuffle(shuffleId, 1)
     0 until 1000 foreach { partitionId =>
       lifecycleManager.commitManager.finishMapperAttempt(shuffleId, 0, 0, 1, 
partitionId)
     }