Skip to content

Commit

Permalink
Fix unmount when host volume is removed
Browse files Browse the repository at this point in the history
Fixes moby#5244
Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael)
  • Loading branch information
crosbymichael committed Apr 14, 2014
1 parent 24c4c3e commit 39103e7
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 4 deletions.
27 changes: 27 additions & 0 deletions integration-cli/docker_cli_rm_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package main

import (
"os"
"os/exec"
"testing"
)

func TestRemoveContainerWithRemovedVolume(t *testing.T) {
cmd := exec.Command(dockerBinary, "run", "--name", "losemyvolumes", "-v", "/tmp/testing:/test", "busybox", "true")
if _, err := runCommand(cmd); err != nil {
t.Fatal(err)
}

if err := os.Remove("/tmp/testing"); err != nil {
t.Fatal(err)
}

cmd = exec.Command(dockerBinary, "rm", "-v", "losemyvolumes")
if _, err := runCommand(cmd); err != nil {
t.Fatal(err)
}

deleteAllContainers()

logDone("rm - removed volume")
}
11 changes: 7 additions & 4 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1867,13 +1867,16 @@ func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status {
for _, bind := range container.HostConfig().Binds {
source := strings.Split(bind, ":")[0]
// TODO: refactor all volume stuff, all of it
// this is very important that we eval the link
// or comparing the keys to container.Volumes will not work
// it is very important that we eval the link or comparing the keys to container.Volumes will not work
//
// eval symlink can fail, ref #5244 if we receive an is not exist error we can ignore it
p, err := filepath.EvalSymlinks(source)
if err != nil {
if err != nil && !os.IsNotExist(err) {
return job.Error(err)
}
source = p
if p != "" {
source = p
}
binds[source] = struct{}{}
}

Expand Down

0 comments on commit 39103e7

Please sign in to comment.