InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race between two ContainerRm

Browse Source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov
2015-12-01 09:54:26 -08:00
parent e75da4b6ff
commit 4d1007d75c
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/delete_test.go
View File

@@ -18,13 +18,16 @@ func TestContainerDoubleDelete(t *testing.T) {
repository: tmp,
root: tmp,
}
daemon.containers = &contStore{s: make(map[string]*Container)}
container := &Container{
CommonContainer: CommonContainer{
ID: "test",
State: NewState(),
Config: &runconfig.Config{},
},
}
daemon.containers.Add(container.ID, container)
// Mark the container as having a delete in progress
if err := container.setRemovalInProgress(); err != nil {
@@ -33,7 +36,7 @@ func TestContainerDoubleDelete(t *testing.T) {
// Try to remove the container when it's start is removalInProgress.
// It should ignore the container and not return an error.
if err := daemon.rm(container, true); err != nil {
if err := daemon.ContainerRm(container.ID, &ContainerRmConfig{ForceRemove: true}); err != nil {
t.Fatal(err)
}
}