You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by re...@apache.org on 2023/05/09 07:24:07 UTC
[incubator-celeborn] branch main updated: [CELEBORN-579] revert Destroy Message rename for compatibility. (#1482)
This is an automated email from the ASF dual-hosted git repository.
rexxiong pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 2fea818fa [CELEBORN-579] revert Destroy Message rename for compatibility. (#1482)
2fea818fa is described below
commit 2fea818fa8b6ec18188885c575e967c468403d39
Author: Shuang <lv...@gmail.com>
AuthorDate: Tue May 9 15:24:02 2023 +0800
[CELEBORN-579] revert Destroy Message rename for compatibility. (#1482)
---
common/src/main/proto/TransportMessages.proto | 4 ++--
.../apache/celeborn/common/protocol/message/ControlMessages.scala | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/src/main/proto/TransportMessages.proto b/common/src/main/proto/TransportMessages.proto
index 2663d08db..fd730638e 100644
--- a/common/src/main/proto/TransportMessages.proto
+++ b/common/src/main/proto/TransportMessages.proto
@@ -50,8 +50,8 @@ enum MessageType {
RESERVE_SLOTS_RESPONSE = 29;
COMMIT_FILES = 30;
COMMIT_FILES_RESPONSE = 31;
- DESTROY_WORKER_SLOTS = 32;
- DESTROY_WORKER_SLOTS_RESPONSE = 33;
+ DESTROY = 32;
+ DESTROY_RESPONSE = 33;
SLAVE_LOST_RESPONSE = 34;
GET_WORKER_INFO = 35;
GET_WORKER_INFO_RESPONSE = 36;
diff --git a/common/src/main/scala/org/apache/celeborn/common/protocol/message/ControlMessages.scala b/common/src/main/scala/org/apache/celeborn/common/protocol/message/ControlMessages.scala
index 2a9c4ffb8..514a5076a 100644
--- a/common/src/main/scala/org/apache/celeborn/common/protocol/message/ControlMessages.scala
+++ b/common/src/main/scala/org/apache/celeborn/common/protocol/message/ControlMessages.scala
@@ -768,7 +768,7 @@ object ControlMessages extends Logging {
.addAllMasterLocations(masterLocations)
.addAllSlaveLocation(slaveLocations)
.build().toByteArray
- new TransportMessage(MessageType.DESTROY_WORKER_SLOTS, payload)
+ new TransportMessage(MessageType.DESTROY, payload)
case DestroyWorkerSlotsResponse(status, failedMasters, failedSlaves) =>
val builder = PbDestroyWorkerSlotsResponse.newBuilder()
@@ -776,7 +776,7 @@ object ControlMessages extends Logging {
builder.addAllFailedMasters(failedMasters)
builder.addAllFailedSlaves(failedSlaves)
val payload = builder.build().toByteArray
- new TransportMessage(MessageType.DESTROY_WORKER_SLOTS_RESPONSE, payload)
+ new TransportMessage(MessageType.DESTROY_RESPONSE, payload)
case SlaveLostResponse(status, slaveLocation) =>
val payload = PbSlaveLostResponse.newBuilder()
@@ -1078,14 +1078,14 @@ object ControlMessages extends Logging {
pbCommitFilesResponse.getTotalWritten,
pbCommitFilesResponse.getFileCount)
- case DESTROY_WORKER_SLOTS =>
+ case DESTROY =>
val pbDestroy = PbDestroyWorkerSlots.parseFrom(message.getPayload)
DestroyWorkerSlots(
pbDestroy.getShuffleKey,
pbDestroy.getMasterLocationsList,
pbDestroy.getSlaveLocationList)
- case DESTROY_WORKER_SLOTS_RESPONSE =>
+ case DESTROY_RESPONSE =>
val pbDestroyResponse = PbDestroyWorkerSlotsResponse.parseFrom(message.getPayload)
DestroyWorkerSlotsResponse(
Utils.toStatusCode(pbDestroyResponse.getStatus),