github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97659 from chenyw1990/fixedPodTerminatingWithSubpathNotEmpty

Browse Source 
don't delete pod from desiredStateOfWorld when pod's sandbox is running
This commit is contained in:
Kubernetes Prow Robot
2021-03-09 16:07:26 -08:00
committed by GitHub
parent e9115a041c 289990db65
commit c3bed939ff
2 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go
View File

@@ -269,7 +269,11 @@ func (dswp *desiredStateOfWorldPopulator) findAndRemoveDeletedPods() {
runningContainers := false runningContainers := false
for _, runningPod := range runningPods { for _, runningPod := range runningPods {
if runningPod.ID == volumeToMount.Pod.UID { if runningPod.ID == volumeToMount.Pod.UID {
if len(runningPod.Containers) > 0 { // runningPod.Containers only include containers in the running state,
// excluding containers in the creating process.
// By adding a non-empty judgment for runningPod.Sandboxes,
// ensure that all containers of the pod have been terminated.
if len(runningPod.Sandboxes) > 0 || len(runningPod.Containers) > 0 {
runningContainers = true runningContainers = true
} }

61
pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go
View File

@@ -34,6 +34,7 @@ import (
csitrans "k8s.io/csi-translation-lib" csitrans "k8s.io/csi-translation-lib"
"k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet/configmap" "k8s.io/kubernetes/pkg/kubelet/configmap"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
kubepod "k8s.io/kubernetes/pkg/kubelet/pod" kubepod "k8s.io/kubernetes/pkg/kubelet/pod"
podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing"
@@ -80,7 +81,7 @@ func prepareDswpWithVolume(t *testing.T) (*desiredStateOfWorldPopulator, kubepod
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, _ := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, _, _ := createDswpWithVolume(t, pv, pvc)
return dswp, fakePodManager return dswp, fakePodManager
} }
@@ -174,7 +175,7 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods(t *testing.T) {
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, fakesDSW := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, fakesDSW, fakeRuntime := createDswpWithVolume(t, pv, pvc)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -229,9 +230,31 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods(t *testing.T) {
podGet.Status.Phase = v1.PodFailed podGet.Status.Phase = v1.PodFailed
fakePodManager.DeletePod(pod) fakePodManager.DeletePod(pod)
//pod is added to fakePodManager but fakeRuntime can not get the pod,so here findAndRemoveDeletedPods() will remove the pod and volumes it is mounted
fakeRuntime.PodList = []*containertest.FakePod{
{
Pod: &kubecontainer.Pod{
Name: pod.Name,
ID: pod.UID,
Sandboxes: []*kubecontainer.Container{
{
Name: "dswp-test-pod-sandbox",
},
},
},
},
}
dswp.findAndRemoveDeletedPods() dswp.findAndRemoveDeletedPods()
if !dswp.pods.processedPods[podName] {
t.Fatalf("Pod should not been removed from desired state of world since sandbox exist")
}
fakeRuntime.PodList = nil
// fakeRuntime can not get the pod,so here findAndRemoveDeletedPods() will remove the pod and volumes it is mounted
dswp.findAndRemoveDeletedPods()
if dswp.pods.processedPods[podName] { if dswp.pods.processedPods[podName] {
t.Fatalf("Failed to remove pods from desired state of world since they no longer exist") t.Fatalf("Failed to remove pods from desired state of world since they no longer exist")
} }
@@ -282,7 +305,7 @@ func TestFindAndRemoveDeletedPodsWithActualState(t *testing.T) {
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, fakesDSW := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, fakesDSW, _ := createDswpWithVolume(t, pv, pvc)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -397,7 +420,7 @@ func TestFindAndRemoveNonattachableVolumes(t *testing.T) {
} }
fakeVolumePluginMgr, fakeVolumePlugin := volumetesting.GetTestKubeletVolumePluginMgr(t) fakeVolumePluginMgr, fakeVolumePlugin := volumetesting.GetTestKubeletVolumePluginMgr(t)
dswp, fakePodManager, fakesDSW := createDswpWithVolumeWithCustomPluginMgr(t, pv, pvc, fakeVolumePluginMgr) dswp, fakePodManager, fakesDSW, _ := createDswpWithVolumeWithCustomPluginMgr(t, pv, pvc, fakeVolumePluginMgr)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -460,7 +483,7 @@ func TestEphemeralVolumeOwnerCheck(t *testing.T) {
// create dswp // create dswp
pod, pv, pvc := createEphemeralVolumeObjects("dswp-test-pod", "dswp-test-volume-name", false /* not owned */) pod, pv, pvc := createEphemeralVolumeObjects("dswp-test-pod", "dswp-test-volume-name", false /* not owned */)
dswp, fakePodManager, _ := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, _, _ := createDswpWithVolume(t, pv, pvc)
fakePodManager.AddPod(pod) fakePodManager.AddPod(pod)
podName := util.GetUniquePodName(pod) podName := util.GetUniquePodName(pod)
@@ -478,7 +501,7 @@ func TestEphemeralVolumeOwnerCheck(t *testing.T) {
func TestEphemeralVolumeEnablement(t *testing.T) { func TestEphemeralVolumeEnablement(t *testing.T) {
// create dswp // create dswp
pod, pv, pvc := createEphemeralVolumeObjects("dswp-test-pod", "dswp-test-volume-name", true /* owned */) pod, pv, pvc := createEphemeralVolumeObjects("dswp-test-pod", "dswp-test-volume-name", true /* owned */)
dswp, fakePodManager, fakesDSW := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, fakesDSW, _ := createDswpWithVolume(t, pv, pvc)
fakePodManager.AddPod(pod) fakePodManager.AddPod(pod)
podName := util.GetUniquePodName(pod) podName := util.GetUniquePodName(pod)
@@ -593,7 +616,7 @@ func TestFindAndAddNewPods_FindAndRemoveDeletedPods_Valid_Block_VolumeDevices(t
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, fakesDSW := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, fakesDSW, _ := createDswpWithVolume(t, pv, pvc)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -700,7 +723,7 @@ func TestCreateVolumeSpec_Valid_File_VolumeMounts(t *testing.T) {
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, _ := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, _, _ := createDswpWithVolume(t, pv, pvc)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -746,7 +769,7 @@ func TestCreateVolumeSpec_Valid_Nil_VolumeMounts(t *testing.T) {
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, _ := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, _, _ := createDswpWithVolume(t, pv, pvc)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -792,7 +815,7 @@ func TestCreateVolumeSpec_Valid_Block_VolumeDevices(t *testing.T) {
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, _ := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, _, _ := createDswpWithVolume(t, pv, pvc)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -838,7 +861,7 @@ func TestCreateVolumeSpec_Invalid_File_VolumeDevices(t *testing.T) {
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, _ := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, _, _ := createDswpWithVolume(t, pv, pvc)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -884,7 +907,7 @@ func TestCreateVolumeSpec_Invalid_Block_VolumeMounts(t *testing.T) {
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
}, },
} }
dswp, fakePodManager, _ := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, _, _ := createDswpWithVolume(t, pv, pvc)
// create pod // create pod
containers := []v1.Container{ containers := []v1.Container{
@@ -1041,7 +1064,7 @@ func TestCheckVolumeFSResize(t *testing.T) {
}, },
} }
dswp, fakePodManager, fakeDSW := createDswpWithVolume(t, pv, pvc) dswp, fakePodManager, fakeDSW, _ := createDswpWithVolume(t, pv, pvc)
fakeASW := dswp.actualStateOfWorld fakeASW := dswp.actualStateOfWorld
containers := []v1.Container{} containers := []v1.Container{}
@@ -1263,14 +1286,14 @@ func createEphemeralVolumeObjects(podName, volumeName string, owned bool) (pod *
return return
} }
func createDswpWithVolume(t *testing.T, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim) (*desiredStateOfWorldPopulator, kubepod.Manager, cache.DesiredStateOfWorld) { func createDswpWithVolume(t *testing.T, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim) (*desiredStateOfWorldPopulator, kubepod.Manager, cache.DesiredStateOfWorld, *containertest.FakeRuntime) {
fakeVolumePluginMgr, _ := volumetesting.GetTestKubeletVolumePluginMgr(t) fakeVolumePluginMgr, _ := volumetesting.GetTestKubeletVolumePluginMgr(t)
dswp, fakePodManager, fakesDSW := createDswpWithVolumeWithCustomPluginMgr(t, pv, pvc, fakeVolumePluginMgr) dswp, fakePodManager, fakesDSW, fakeRuntime := createDswpWithVolumeWithCustomPluginMgr(t, pv, pvc, fakeVolumePluginMgr)
return dswp, fakePodManager, fakesDSW return dswp, fakePodManager, fakesDSW, fakeRuntime
} }
func createDswpWithVolumeWithCustomPluginMgr(t *testing.T, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim, func createDswpWithVolumeWithCustomPluginMgr(t *testing.T, pv *v1.PersistentVolume, pvc *v1.PersistentVolumeClaim,
fakeVolumePluginMgr *volume.VolumePluginMgr) (*desiredStateOfWorldPopulator, kubepod.Manager, cache.DesiredStateOfWorld) { fakeVolumePluginMgr *volume.VolumePluginMgr) (*desiredStateOfWorldPopulator, kubepod.Manager, cache.DesiredStateOfWorld, *containertest.FakeRuntime) {
fakeClient := &fake.Clientset{} fakeClient := &fake.Clientset{}
fakeClient.AddReactor("get", "persistentvolumeclaims", func(action core.Action) (bool, runtime.Object, error) { fakeClient.AddReactor("get", "persistentvolumeclaims", func(action core.Action) (bool, runtime.Object, error) {
return true, pvc, nil return true, pvc, nil
@@ -1307,5 +1330,5 @@ func createDswpWithVolumeWithCustomPluginMgr(t *testing.T, pv *v1.PersistentVolu
intreeToCSITranslator: csiTranslator, intreeToCSITranslator: csiTranslator,
volumePluginMgr: fakeVolumePluginMgr, volumePluginMgr: fakeVolumePluginMgr,
} }
return dswp, fakePodManager, fakesDSW return dswp, fakePodManager, fakesDSW, fakeRuntime
} }