You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by zh...@apache.org on 2024/02/20 03:54:02 UTC
(incubator-celeborn) branch branch-0.3 updated: [CELEBORN-1272] Do not increment epoch when retry commit
This is an automated email from the ASF dual-hosted git repository.
zhouky pushed a commit to branch branch-0.3
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/branch-0.3 by this push:
new 1f7c4402d [CELEBORN-1272] Do not increment epoch when retry commit
1f7c4402d is described below
commit 1f7c4402db3aad7ea1c4960112f02af0003dd07c
Author: zky.zhoukeyong <zk...@alibaba-inc.com>
AuthorDate: Tue Feb 20 11:53:28 2024 +0800
[CELEBORN-1272] Do not increment epoch when retry commit
### What changes were proposed in this pull request?
https://github.com/apache/incubator-celeborn/pull/2145 https://github.com/apache/incubator-celeborn/pull/2162 changes the behavior that retry commit files should use the same epoch. This PR revert the behavior back.
### Why are the changes needed?
ditto
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Passes UTs.
Closes #2299 from waitinfuture/1272.
Authored-by: zky.zhoukeyong <zk...@alibaba-inc.com>
Signed-off-by: waitinfuture <zk...@alibaba-inc.com>
(cherry picked from commit 429cf65c144d424ad3e160bc926a9263b77fee56)
Signed-off-by: waitinfuture <zk...@alibaba-inc.com>
---
.../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 632d407da..4ca99b74f 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
@@ -213,7 +213,7 @@ abstract class CommitHandler(
status.startTime = currentTime
val mockFailure = status.message.mockFailure && (status.retriedTimes < maxRetries)
val msg =
- status.message.copy(epoch = commitEpoch.incrementAndGet(), mockFailure = mockFailure)
+ status.message.copy(mockFailure = mockFailure)
status.future = commitFiles(
status.workerInfo,
msg)