github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

kubelet: do not cleanup volumes if pod is being killed

Browse Source
This commit is contained in:
Ryan Phillips 2021-04-26 09:46:51 -05:00
parent 19c7089245
commit 1f81b44cc7
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet_test.go
View File

@ -1596,6 +1596,12 @@ func syncAndVerifyPodDir(t *testing.T, testKubelet *TestKubelet, pods []*v1.Pod,
kl.podManager.SetPods(pods) kl.podManager.SetPods(pods)
kl.HandlePodSyncs(pods) kl.HandlePodSyncs(pods)
kl.HandlePodCleanups() kl.HandlePodCleanups()
// The first time HandlePodCleanups() is run the pod is placed into the
// podKiller, and bypasses the pod directory cleanup. The pod is
// already killed in the second run to HandlePodCleanups() and will
// cleanup the directories.
time.Sleep(2 * time.Second)
kl.HandlePodCleanups()
for i, pod := range podsToCheck { for i, pod := range podsToCheck {
exist := dirExists(kl.getPodDir(pod.UID)) exist := dirExists(kl.getPodDir(pod.UID))
assert.Equal(t, shouldExist, exist, "directory of pod %d", i) assert.Equal(t, shouldExist, exist, "directory of pod %d", i)

5
pkg/kubelet/kubelet_volumes.go
View File

@ -133,6 +133,11 @@ func (kl *Kubelet) cleanupOrphanedPodDirs(pods []*v1.Pod, runningPods []*kubecon
if allPods.Has(string(uid)) { if allPods.Has(string(uid)) {
continue continue
} }
// if the pod is within termination grace period, we shouldn't cleanup the underlying volumes
if kl.podKiller.IsPodPendingTerminationByUID(uid) {
klog.V(3).InfoS("Pod is pending termination", "podUID", uid)
continue
}
// If volumes have not been unmounted/detached, do not delete directory. // If volumes have not been unmounted/detached, do not delete directory.
// Doing so may result in corruption of data. // Doing so may result in corruption of data.
// TODO: getMountedVolumePathListFromDisk() call may be redundant with // TODO: getMountedVolumePathListFromDisk() call may be redundant with