Merge pull request #26211 from aaronlehmann/no-advertise-addr-detection-on-join
cluster: Do not autodetect advertise address on join
This commit is contained in:
commit
beba6ea311
|
@ -467,11 +467,13 @@ func (c *Cluster) Join(req types.JoinRequest) error {
|
|||
}
|
||||
|
||||
var advertiseAddr string
|
||||
advertiseHost, advertisePort, err := c.resolveAdvertiseAddr(req.AdvertiseAddr, listenPort)
|
||||
// For joining, we don't need to provide an advertise address,
|
||||
// since the remote side can detect it.
|
||||
if err == nil {
|
||||
advertiseAddr = net.JoinHostPort(advertiseHost, advertisePort)
|
||||
if req.AdvertiseAddr != "" {
|
||||
advertiseHost, advertisePort, err := c.resolveAdvertiseAddr(req.AdvertiseAddr, listenPort)
|
||||
// For joining, we don't need to provide an advertise address,
|
||||
// since the remote side can detect it.
|
||||
if err == nil {
|
||||
advertiseAddr = net.JoinHostPort(advertiseHost, advertisePort)
|
||||
}
|
||||
}
|
||||
|
||||
// todo: check current state existing
|
||||
|
|
Loading…
Reference in New Issue