kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #732 from mrjana/bugs

Browse source 
Retain sandbox only if network is not available
This commit is contained in:
Madhu Venugopal 2015-11-03 03:15:37 +01:00
commit ecf146013a
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libnetwork/sandbox.go
View file

@ -177,13 +177,18 @@ func (sb *sandbox) Delete() error {
continue continue
} }
if err := ep.Leave(sb); err != nil { // Retain the sanbdox if we can't obtain the network from store.
if _, err := c.getNetworkFromStore(ep.getNetwork().ID()); err != nil {
retain = true retain = true
log.Warnf("Failed getting network for ep %s during sandbox %s delete: %v", ep.ID(), sb.ID(), err)
continue
}
if err := ep.Leave(sb); err != nil {
log.Warnf("Failed detaching sandbox %s from endpoint %s: %v\n", sb.ID(), ep.ID(), err) log.Warnf("Failed detaching sandbox %s from endpoint %s: %v\n", sb.ID(), ep.ID(), err)
} }
if err := ep.Delete(); err != nil { if err := ep.Delete(); err != nil {
retain = true
log.Warnf("Failed deleting endpoint %s: %v\n", ep.ID(), err) log.Warnf("Failed deleting endpoint %s: %v\n", ep.ID(), err)
} }
} }
@ -455,7 +460,7 @@ func (sb *sandbox) populateNetworkResources(ep *endpoint) error {
i := ep.iface i := ep.iface
ep.Unlock() ep.Unlock()
if i.srcName != "" { if i != nil && i.srcName != "" {
var ifaceOptions []osl.IfaceOption var ifaceOptions []osl.IfaceOption
ifaceOptions = append(ifaceOptions, sb.osSbox.InterfaceOptions().Address(i.addr), sb.osSbox.InterfaceOptions().Routes(i.routes)) ifaceOptions = append(ifaceOptions, sb.osSbox.InterfaceOptions().Address(i.addr), sb.osSbox.InterfaceOptions().Routes(i.routes))
@ -951,6 +956,11 @@ func OptionGeneric(generic map[string]interface{}) SandboxOption {
func (eh epHeap) Len() int { return len(eh) } func (eh epHeap) Len() int { return len(eh) }
func (eh epHeap) Less(i, j int) bool { func (eh epHeap) Less(i, j int) bool {
var (
cip, cjp int
ok bool
)
ci, _ := eh[i].getSandbox() ci, _ := eh[i].getSandbox()
cj, _ := eh[j].getSandbox() cj, _ := eh[j].getSandbox()
@ -965,14 +975,20 @@ func (eh epHeap) Less(i, j int) bool {
return true return true
} }
cip, ok := ci.epPriority[eh[i].ID()] if ci != nil {
if !ok { cip, ok = ci.epPriority[eh[i].ID()]
cip = 0 if !ok {
cip = 0
}
} }
cjp, ok := cj.epPriority[eh[j].ID()]
if !ok { if cj != nil {
cjp = 0 cjp, ok = cj.epPriority[eh[j].ID()]
if !ok {
cjp = 0
}
} }
if cip == cjp { if cip == cjp {
return eh[i].network.Name() < eh[j].network.Name() return eh[i].network.Name() < eh[j].network.Name()
} }