[incubator-celeborn] branch branch-0.2 updated: [CELEBORN-155] Wrong TimeUnit for registerShuffleRetryWait in Shuffle… (#1099) (#1101)

[zhouky]

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

zhouky pushed a commit to branch branch-0.2
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git


The following commit(s) were added to refs/heads/branch-0.2 by this push:
     new 1b3fbae9 [CELEBORN-155] Wrong TimeUnit for registerShuffleRetryWait in 
Shuffle… (#1099) (#1101)
1b3fbae9 is described below

commit 1b3fbae9b6b299640444a3d5c3aa0da8deafecea
Author: Keyong Zhou <zho...@apache.org>
AuthorDate: Mon Dec 19 17:40:25 2022 +0800

    [CELEBORN-155] Wrong TimeUnit for registerShuffleRetryWait in Shuffle… 
(#1099) (#1101)
---
 .../src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java | 6 +++---
 common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java 
b/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java
index 217e225f..a5aa2020 100644
--- a/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java
+++ b/client/src/main/java/org/apache/celeborn/client/ShuffleClientImpl.java
@@ -80,7 +80,7 @@ public class ShuffleClientImpl extends ShuffleClient {
   private final UserIdentifier userIdentifier;
 
   private final int registerShuffleMaxRetries;
-  private final long registerShuffleRetryWait;
+  private final long registerShuffleRetryWaitMs;
   private final int maxInFlight;
   private final int pushBufferMaxSize;
 
@@ -130,7 +130,7 @@ public class ShuffleClientImpl extends ShuffleClient {
     this.conf = conf;
     this.userIdentifier = userIdentifier;
     registerShuffleMaxRetries = conf.registerShuffleMaxRetry();
-    registerShuffleRetryWait = conf.registerShuffleRetryWait();
+    registerShuffleRetryWaitMs = conf.registerShuffleRetryWaitMs();
     maxInFlight = conf.pushMaxReqsInFlight();
     pushBufferMaxSize = conf.pushBufferMaxSize();
 
@@ -339,7 +339,7 @@ public class ShuffleClientImpl extends ShuffleClient {
       }
 
       try {
-        TimeUnit.SECONDS.sleep(registerShuffleRetryWait);
+        TimeUnit.MILLISECONDS.sleep(registerShuffleRetryWaitMs);
       } catch (InterruptedException e) {
         break;
       }
diff --git 
a/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala 
b/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala
index ec837625..cb344baa 100644
--- a/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala
+++ b/common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala
@@ -520,7 +520,7 @@ class CelebornConf(loadDefaults: Boolean) extends Cloneable 
with Logging with Se
   def shuffleManagerPort: Int = get(SHUFFLE_MANAGER_PORT)
   def shuffleChunkSize: Long = get(SHUFFLE_CHUCK_SIZE)
   def registerShuffleMaxRetry: Int = get(SHUFFLE_REGISTER_MAX_RETRIES)
-  def registerShuffleRetryWait: Long = get(SHUFFLE_REGISTER_RETRY_WAIT)
+  def registerShuffleRetryWaitMs: Long = get(SHUFFLE_REGISTER_RETRY_WAIT)
   def reserveSlotsMaxRetries: Int = get(RESERVE_SLOTS_MAX_RETRIES)
   def reserveSlotsRetryWait: Long = get(RESERVE_SLOTS_RETRY_WAIT)
   def rpcMaxParallelism: Int = get(CLIENT_RPC_MAX_PARALLELISM)