This is an automated email from the ASF dual-hosted git repository.
rexxiong pushed a commit to branch branch-0.5
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/branch-0.5 by this push:
new 691b82aa5 [CELEBORN-1976] CommitHandler should use
celeborn.client.rpc.commitFiles.askTimeout for timeout of doParallelCommitFiles
691b82aa5 is described below
commit 691b82aa511b3dbb4cb554fa528bdf52850c7cdc
Author: SteNicholas <[email protected]>
AuthorDate: Thu Apr 24 09:28:37 2025 +0800
[CELEBORN-1976] CommitHandler should use
celeborn.client.rpc.commitFiles.askTimeout for timeout of doParallelCommitFiles
### What changes were proposed in this pull request?
`CommitHandler` should use `celeborn.client.rpc.commitFiles.askTimeout`
instead of `celeborn.rpc.askTimeout` for timeout of `doParallelCommitFiles`.
### Why are the changes needed?
`CommitHandler` uses `celeborn.rpc.askTimeout` for timeout of
`doParallelCommitFiles` at present, which should be controlled with
`celeborn.client.rpc.commitFiles.askTimeout`.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
GA.
Closes #3222 from SteNicholas/CELEBORN-1976.
Authored-by: SteNicholas <[email protected]>
Signed-off-by: Shuang <[email protected]>
(cherry picked from commit c9267ce9a37d7614c2eedb439bdcf88409663df9)
Signed-off-by: Shuang <[email protected]>
---
.../main/scala/org/apache/celeborn/client/commit/CommitHandler.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/client/src/main/scala/org/apache/celeborn/client/commit/CommitHandler.scala
b/client/src/main/scala/org/apache/celeborn/client/commit/CommitHandler.scala
index 82166afe1..a3cded208 100644
---
a/client/src/main/scala/org/apache/celeborn/client/commit/CommitHandler.scala
+++
b/client/src/main/scala/org/apache/celeborn/client/commit/CommitHandler.scala
@@ -292,7 +292,7 @@ abstract class CommitHandler(
val futureSeq = Future.sequence(outFutures)(cbf, ec)
awaitResult(futureSeq, Duration.Inf)
- val timeout = conf.rpcAskTimeout.duration.toMillis
+ val timeout = clientRpcCommitFilesAskTimeout.duration.toMillis
var remainingTime = timeout * maxRetries
val delta = 50
while (remainingTime >= 0 && !futures.isEmpty) {
