Dont notify the leave if the serf is not inited
Overlay driver allows local containers to communicate in overly network even when the serf is not fully inited. But when the container leaves an overlay network, it gets stuck waiting on a nil notifyCh, when the serf is not fully initialized. Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
parent
e550f1b840
commit
473ce7db08
1 changed files with 6 additions and 4 deletions
|
@ -118,10 +118,12 @@ func (d *driver) Leave(nid, eid string) error {
|
|||
return fmt.Errorf("could not find network with id %s", nid)
|
||||
}
|
||||
|
||||
d.notifyCh <- ovNotify{
|
||||
action: "leave",
|
||||
nid: nid,
|
||||
eid: eid,
|
||||
if d.notifyCh != nil {
|
||||
d.notifyCh <- ovNotify{
|
||||
action: "leave",
|
||||
nid: nid,
|
||||
eid: eid,
|
||||
}
|
||||
}
|
||||
|
||||
n.leaveSandbox()
|
||||
|
|
Loading…
Add table
Reference in a new issue