(incubator-celeborn) branch main updated: [CELEBORN-1263] Fix Master HA mode without internal port error

[chengpan]

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

chengpan 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 a8a6e1fdc [CELEBORN-1263] Fix Master HA mode without internal port 
error
a8a6e1fdc is described below

commit a8a6e1fdcace5f7689092ede66abeed5c773b3b6
Author: 吴祥平 <408317...@qq.com>
AuthorDate: Sun Feb 4 16:03:47 2024 +0800

    [CELEBORN-1263] Fix Master HA mode without internal port error
    
    ### What changes were proposed in this pull request?
    Master can not start up with ha mode
    
    ### Why are the changes needed?
    
![image](https://github.com/apache/incubator-celeborn/assets/3350718/2856f89e-70bf-4e8e-b05d-5c37cfc6d6b8)
    
    ### Does this PR introduce _any_ user-facing change?
    no
    
    ### How was this patch tested?
    local tested
    
    Closes #2283 from wxplovecc/fix-ha-internal-port.
    
    Lead-authored-by: 吴祥平 <408317...@qq.com>
    Co-authored-by: 吴祥平 <wxp4...@ly.com>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 .../org/apache/celeborn/service/deploy/master/MasterArguments.scala   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/master/src/main/scala/org/apache/celeborn/service/deploy/master/MasterArguments.scala
 
b/master/src/main/scala/org/apache/celeborn/service/deploy/master/MasterArguments.scala
index 738d582e4..701116a2e 100644
--- 
a/master/src/main/scala/org/apache/celeborn/service/deploy/master/MasterArguments.scala
+++ 
b/master/src/main/scala/org/apache/celeborn/service/deploy/master/MasterArguments.scala
@@ -44,7 +44,9 @@ class MasterArguments(args: Array[String], conf: 
CelebornConf) {
     val localNode = clusterInfo.localNode
     _host = _host.orElse(Some(conf.haMasterNodeHost(localNode.nodeId)))
     _port = _port.orElse(Some(conf.haMasterNodePort(localNode.nodeId)))
-    _internalPort = 
_internalPort.orElse(Some(conf.haMasterNodeInternalPort(localNode.nodeId)))
+    _internalPort = _internalPort.orElse {
+      if (conf.internalPortEnabled) 
Some(conf.haMasterNodeInternalPort(localNode.nodeId)) else None
+    }
     _masterClusterInfo = Some(clusterInfo)
   } else {
     _host = _host.orElse(Some(conf.masterHost))