github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Clarify log messages for orphaned volume cleanup

Browse Source
This commit is contained in:
Paul Morie 2016-04-26 16:30:09 -04:00
parent 7e430f543b
commit 11113a00d7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/kubelet.go
View File

@ -1987,23 +1987,24 @@ func (kl *Kubelet) cleanupOrphanedVolumes(pods []*api.Pod, runningPods []*kubeco
if _, ok := desiredVolumes[name]; !ok { if _, ok := desiredVolumes[name]; !ok {
parts := strings.Split(name, "/") parts := strings.Split(name, "/")
if runningSet.Has(parts[0]) { if runningSet.Has(parts[0]) {
glog.Infof("volume %q, still has a container running %q, skipping teardown", name, parts[0]) glog.Infof("volume %q, still has a container running (%q), skipping teardown", name, parts[0])
continue continue
} }
//TODO (jonesdl) We should somehow differentiate between volumes that are supposed //TODO (jonesdl) We should somehow differentiate between volumes that are supposed
//to be deleted and volumes that are leftover after a crash. //to be deleted and volumes that are leftover after a crash.
glog.Warningf("Orphaned volume %q found, tearing down volume", name) glog.V(3).Infof("Orphaned volume %q found, tearing down volume", name)
// TODO(yifan): Refactor this hacky string manipulation. // TODO(yifan): Refactor this hacky string manipulation.
kl.volumeManager.DeleteVolumes(types.UID(parts[0])) kl.volumeManager.DeleteVolumes(types.UID(parts[0]))
// Get path reference count // Get path reference count
refs, err := mount.GetMountRefs(kl.mounter, cleaner.Unmounter.GetPath()) volumePath := cleaner.Unmounter.GetPath()
refs, err := mount.GetMountRefs(kl.mounter, volumePath)
if err != nil { if err != nil {
return fmt.Errorf("Could not get mount path references %v", err) glog.Errorf("Could not get mount path references for %q: %v", volumePath, err)
} }
//TODO (jonesdl) This should not block other kubelet synchronization procedures //TODO (jonesdl) This should not block other kubelet synchronization procedures
err = cleaner.Unmounter.TearDown() err = cleaner.Unmounter.TearDown()
if err != nil { if err != nil {
glog.Errorf("Could not tear down volume %q: %v", name, err) glog.Errorf("Could not tear down volume %q at %q: %v", name, volumePath, err)
} }
// volume is unmounted. some volumes also require detachment from the node. // volume is unmounted. some volumes also require detachment from the node.
@ -2011,7 +2012,7 @@ func (kl *Kubelet) cleanupOrphanedVolumes(pods []*api.Pod, runningPods []*kubeco
detacher := *cleaner.Detacher detacher := *cleaner.Detacher
err = detacher.Detach() err = detacher.Detach()
if err != nil { if err != nil {
glog.Errorf("Could not detach volume %q: %v", name, err) glog.Errorf("Could not detach volume %q at %q: %v", name, volumePath, err)
} }
} }
} }