(celeborn) branch main updated: [CELEBORN-1337][FOLLOWUP] Fix compile problem

[nicholasjiang]

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

nicholasjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/celeborn.git


The following commit(s) were added to refs/heads/main by this push:
     new 0298cfb35 [CELEBORN-1337][FOLLOWUP] Fix compile problem
0298cfb35 is described below

commit 0298cfb3559c0a6345b743840c40582f5ceea4d5
Author: Shuang <lvshuang....@alibaba-inc.com>
AuthorDate: Thu Jun 13 12:17:20 2024 +0800

    [CELEBORN-1337][FOLLOWUP] Fix compile problem
    
    ### What changes were proposed in this pull request?
    Fix compile problem as CELEBORN-1337 auto merge conflict with CELEBORN-1444.
    
    ### Why are the changes needed?
    Fix compile problem as 1337 conflict with CELEBORN-1444.
    
    ### Does this PR introduce _any_ user-facing change?
    NO
    
    ### How was this patch tested?
    PASS GA
    
    Closes #2559 from RexXiong/minor_fix_compile_problem.
    
    Authored-by: Shuang <lvshuang....@alibaba-inc.com>
    Signed-off-by: SteNicholas <programg...@163.com>
---
 .../org/apache/celeborn/common/protocol/message/ControlMessages.scala  | 2 +-
 .../src/main/scala/org/apache/celeborn/common/util/PbSerDeUtils.scala  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 7e772c749..94d4a22a8 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
@@ -785,7 +785,7 @@ object ControlMessages extends Logging {
     case ReportWorkerDecommission(workers, requestId) =>
       val payload = PbReportWorkerDecommission.newBuilder()
         .addAllWorkers(workers.asScala.map { workerInfo =>
-          PbSerDeUtils.toPbWorkerInfo(workerInfo, true)
+          PbSerDeUtils.toPbWorkerInfo(workerInfo, true, false)
         }.toList.asJava)
         .setRequestId(requestId).build().toByteArray
       new TransportMessage(MessageType.REPORT_WORKER_DECOMMISSION, payload)
diff --git 
a/common/src/main/scala/org/apache/celeborn/common/util/PbSerDeUtils.scala 
b/common/src/main/scala/org/apache/celeborn/common/util/PbSerDeUtils.scala
index e8fe6855d..77db460ea 100644
--- a/common/src/main/scala/org/apache/celeborn/common/util/PbSerDeUtils.scala
+++ b/common/src/main/scala/org/apache/celeborn/common/util/PbSerDeUtils.scala
@@ -450,7 +450,8 @@ object PbSerDeUtils {
         case (worker, workerEventInfo) =>
           (worker.toUniqueId(), 
PbSerDeUtils.toPbWorkerEventInfo(workerEventInfo))
       }.asJava)
-      
.addAllDecommissionWorkers(decommissionWorkers.asScala.map(toPbWorkerInfo(_, 
true)).asJava)
+      .addAllDecommissionWorkers(decommissionWorkers.asScala.map(
+        toPbWorkerInfo(_, true, false)).asJava)
 
     if (currentAppDiskUsageMetricsSnapshot != null) {
       builder.setCurrentAppDiskUsageMetricsSnapshot(