beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Create new network on dead ghosts on restart.

Browse source 
Fixes #2089
This commit is contained in:
Paul Nasrat 2013-10-27 09:04:57 -04:00
parent 4cbb6ce13b
commit 95708dd35c
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -140,6 +140,7 @@ odk- <github@odkurzacz.org>
Pascal Borreli <pascal@borreli.com> Pascal Borreli <pascal@borreli.com>
Paul Bowsher <pbowsher@globalpersonals.co.uk> Paul Bowsher <pbowsher@globalpersonals.co.uk>
Paul Hammond <paul@paulhammond.org> Paul Hammond <paul@paulhammond.org>
Paul Nasrat <pnasrat@gmail.com>
Phil Spitler <pspitler@gmail.com> Phil Spitler <pspitler@gmail.com>
Piotr Bogdan <ppbogdan@gmail.com> Piotr Bogdan <ppbogdan@gmail.com>
pysqz <randomq@126.com> pysqz <randomq@126.com>

23
container.go
View file

@ -1062,12 +1062,7 @@ func (container *Container) allocateNetwork() error {
var iface *NetworkInterface var iface *NetworkInterface
var err error var err error
if !container.State.Ghost { if container.State.Ghost {
iface, err = container.runtime.networkManager.Allocate()
if err != nil {
return err
}
} else {
manager := container.runtime.networkManager manager := container.runtime.networkManager
if manager.disabled { if manager.disabled {
iface = &NetworkInterface{disabled: true} iface = &NetworkInterface{disabled: true}
@ -1077,8 +1072,20 @@ func (container *Container) allocateNetwork() error {
Gateway: manager.bridgeNetwork.IP, Gateway: manager.bridgeNetwork.IP,
manager: manager, manager: manager,
} }
ipNum := ipToInt(iface.IPNet.IP) if iface !=nil && iface.IPNet.IP != nil {
manager.ipAllocator.inUse[ipNum] = struct{}{} ipNum := ipToInt(iface.IPNet.IP)
manager.ipAllocator.inUse[ipNum] = struct{}{}
} else {
iface, err = container.runtime.networkManager.Allocate()
if err != nil {
return err
}
}
}
} else {
iface, err = container.runtime.networkManager.Allocate()
if err != nil {
return err
} }
} }

14
container_test.go
View file

@ -1657,11 +1657,13 @@ func TestRestartGhost(t *testing.T) {
runtime := mkRuntime(t) runtime := mkRuntime(t)
defer nuke(runtime) defer nuke(runtime)
container, err := runtime.Create(&Config{ container, _, err := runtime.Create(
Image: GetTestImage(runtime).ID, &Config{
Cmd: []string{"sh", "-c", "echo -n bar > /test/foo"}, Image: GetTestImage(runtime).ID,
Volumes: map[string]struct{}{"/test": {}}, Cmd: []string{"sh", "-c", "echo -n bar > /test/foo"},
}, Volumes: map[string]struct{}{"/test": {}},
},
"",
) )
if err != nil { if err != nil {
@ -1677,4 +1679,4 @@ func TestRestartGhost(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }