github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10821 from jimmidyson/gc-container-volumes 

Fixes #10803: Delete Docker container volumes on GC
pull/6/head
Vish Kannan 2015-07-22 16:02:03 -07:00
parent 20293058ec 159c3c87de
commit 4421b3dfdd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/container_gc.go
View File

@ -138,7 +138,7 @@ func (cgc *realContainerGC) GarbageCollect() error {
// Remove unidentified containers. // Remove unidentified containers.
for _, container := range unidentifiedContainers { for _, container := range unidentifiedContainers {
glog.Infof("Removing unidentified dead container %q with ID %q", container.name, container.id) glog.Infof("Removing unidentified dead container %q with ID %q", container.name, container.id)
err = cgc.dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: container.id}) err = cgc.dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: container.id, RemoveVolumes: true})
if err != nil { if err != nil {
glog.Warningf("Failed to remove unidentified dead container %q: %v", container.name, err) glog.Warningf("Failed to remove unidentified dead container %q: %v", container.name, err)
} }
@ -201,7 +201,7 @@ func (cgc *realContainerGC) removeOldestN(containers []containerGCInfo, toRemove
// Remove from oldest to newest (last to first). // Remove from oldest to newest (last to first).
numToKeep := len(containers) - toRemove numToKeep := len(containers) - toRemove
for i := numToKeep; i < len(containers); i++ { for i := numToKeep; i < len(containers); i++ {
err := cgc.dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: containers[i].id}) err := cgc.dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: containers[i].id, RemoveVolumes: true})
if err != nil { if err != nil {
glog.Warningf("Failed to remove dead container %q: %v", containers[i].name, err) glog.Warningf("Failed to remove dead container %q: %v", containers[i].name, err)
} }