mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
agentSetup to first check if clusterProvider is nil
- concurrent swarm join and daemon stop seen in integration tests may cause agentSetup to access a nil clusterProvider, resulting in a panic Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
parent
de0926bf39
commit
46ebc9613e
1 changed files with 7 additions and 0 deletions
|
@ -187,6 +187,13 @@ func (c *controller) agentSetup() error {
|
|||
clusterProvider := c.cfg.Daemon.ClusterProvider
|
||||
agent := c.agent
|
||||
c.Unlock()
|
||||
|
||||
if clusterProvider == nil {
|
||||
msg := "Aborting initialization of Libnetwork Agent because cluster provider is now unset"
|
||||
logrus.Errorf(msg)
|
||||
return fmt.Errorf(msg)
|
||||
}
|
||||
|
||||
bindAddr := clusterProvider.GetLocalAddress()
|
||||
advAddr := clusterProvider.GetAdvertiseAddress()
|
||||
remote := clusterProvider.GetRemoteAddress()
|
||||
|
|
Loading…
Reference in a new issue