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 b30f84053 [CELEBORN-1665] CommitHandler should process
CommitFilesResponse with COMMIT_FILE_EXCEPTION status
b30f84053 is described below
commit b30f8405372a42a7e921c3e50dd9e6d75121ea0c
Author: SteNicholas <[email protected]>
AuthorDate: Tue Oct 22 17:49:52 2024 +0800
[CELEBORN-1665] CommitHandler should process CommitFilesResponse with
COMMIT_FILE_EXCEPTION status
### What changes were proposed in this pull request?
`CommitHandler` should process `CommitFilesResponse` with
`COMMIT_FILE_EXCEPTION` status.
### Why are the changes needed?
`CommitHandler` processes `CommitFilesResponse` with statuses including
`SUCCESS`, `PARTIAL_SUCCESS`, `SHUFFLE_NOT_REGISTERED`, `REQUEST_FAILED` and
`WORKER_EXCLUDED` at present. Meanwhile, Controller replies
`CommitFilesResponse` with `COMMIT_FILE_EXCEPTION` status for throwable.
Therefore, `CommitHandler` should process `COMMIT_FILE_EXCEPTION` status.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
No.
Closes #2838 from SteNicholas/CELEBORN-1665.
Authored-by: SteNicholas <[email protected]>
Signed-off-by: Shuang <[email protected]>
(cherry picked from commit 06bd39b7689a6bf65cabd5d039f56ab641a9c96a)
Signed-off-by: Shuang <[email protected]>
---
.../celeborn/client/commit/CommitHandler.scala | 2 +-
.../org/apache/celeborn/common/util/Utils.scala | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 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 8532599bd..da95486eb 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
@@ -305,7 +305,7 @@ abstract class CommitHandler(
status.future.value.get match {
case scala.util.Success(res) =>
res.status match {
- case StatusCode.SUCCESS | StatusCode.PARTIAL_SUCCESS |
StatusCode.SHUFFLE_NOT_REGISTERED | StatusCode.REQUEST_FAILED |
StatusCode.WORKER_EXCLUDED =>
+ case StatusCode.SUCCESS | StatusCode.PARTIAL_SUCCESS |
StatusCode.SHUFFLE_NOT_REGISTERED | StatusCode.REQUEST_FAILED |
StatusCode.WORKER_EXCLUDED | StatusCode.COMMIT_FILE_EXCEPTION =>
logInfo(s"Request commitFiles return ${res.status} for " +
s"${Utils.makeShuffleKey(appUniqueId, shuffleId)}")
if (res.status != StatusCode.SUCCESS && res.status !=
StatusCode.WORKER_EXCLUDED) {
diff --git a/common/src/main/scala/org/apache/celeborn/common/util/Utils.scala
b/common/src/main/scala/org/apache/celeborn/common/util/Utils.scala
index 0b0fa4ed7..af7abc191 100644
--- a/common/src/main/scala/org/apache/celeborn/common/util/Utils.scala
+++ b/common/src/main/scala/org/apache/celeborn/common/util/Utils.scala
@@ -1070,10 +1070,24 @@ object Utils extends Logging {
StatusCode.WORKER_EXCLUDED
case 28 =>
StatusCode.WORKER_UNKNOWN
+ case 29 =>
+ StatusCode.COMMIT_FILE_EXCEPTION
case 30 =>
StatusCode.PUSH_DATA_SUCCESS_PRIMARY_CONGESTED
case 31 =>
StatusCode.PUSH_DATA_SUCCESS_REPLICA_CONGESTED
+ case 32 =>
+ StatusCode.PUSH_DATA_HANDSHAKE_FAIL_REPLICA
+ case 33 =>
+ StatusCode.PUSH_DATA_HANDSHAKE_FAIL_PRIMARY
+ case 34 =>
+ StatusCode.REGION_START_FAIL_REPLICA
+ case 35 =>
+ StatusCode.REGION_START_FAIL_PRIMARY
+ case 36 =>
+ StatusCode.REGION_FINISH_FAIL_REPLICA
+ case 37 =>
+ StatusCode.REGION_FINISH_FAIL_PRIMARY
case 38 =>
StatusCode.PUSH_DATA_CREATE_CONNECTION_FAIL_PRIMARY
case 39 =>
@@ -1100,6 +1114,12 @@ object Utils extends Logging {
StatusCode.COMMIT_FILES_MOCK_FAILURE
case 50 =>
StatusCode.PUSH_DATA_FAIL_NON_CRITICAL_CAUSE_REPLICA
+ case 51 =>
+ StatusCode.OPEN_STREAM_FAILED
+ case 52 =>
+ StatusCode.SEGMENT_START_FAIL_REPLICA
+ case 53 =>
+ StatusCode.SEGMENT_START_FAIL_PRIMARY
case _ =>
null
}
