mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
kubelet: set terminated podWorker status for terminated pods
This commit is contained in:
parent
79ee735bad
commit
0166d446b9
@ -28,6 +28,7 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/util/runtime"
|
"k8s.io/apimachinery/pkg/util/runtime"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
"k8s.io/client-go/tools/record"
|
"k8s.io/client-go/tools/record"
|
||||||
|
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
||||||
"k8s.io/kubernetes/pkg/kubelet/events"
|
"k8s.io/kubernetes/pkg/kubelet/events"
|
||||||
@ -501,6 +502,22 @@ func (p *podWorkers) IsPodForMirrorPodTerminatingByFullName(podFullName string)
|
|||||||
return ok
|
return ok
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isPodStatusCacheTerminal(status *kubecontainer.PodStatus) bool {
|
||||||
|
runningContainers := 0
|
||||||
|
runningSandboxes := 0
|
||||||
|
for _, container := range status.ContainerStatuses {
|
||||||
|
if container.State == kubecontainer.ContainerStateRunning {
|
||||||
|
runningContainers++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, sb := range status.SandboxStatuses {
|
||||||
|
if sb.State == runtimeapi.PodSandboxState_SANDBOX_READY {
|
||||||
|
runningSandboxes++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return runningContainers == 0 && runningSandboxes == 0
|
||||||
|
}
|
||||||
|
|
||||||
// UpdatePod carries a configuration change or termination state to a pod. A pod is either runnable,
|
// UpdatePod carries a configuration change or termination state to a pod. A pod is either runnable,
|
||||||
// terminating, or terminated, and will transition to terminating if deleted on the apiserver, it is
|
// terminating, or terminated, and will transition to terminating if deleted on the apiserver, it is
|
||||||
// discovered to have a terminal phase (Succeeded or Failed), or if it is evicted by the kubelet.
|
// discovered to have a terminal phase (Succeeded or Failed), or if it is evicted by the kubelet.
|
||||||
@ -536,6 +553,22 @@ func (p *podWorkers) UpdatePod(options UpdatePodOptions) {
|
|||||||
status = &podSyncStatus{
|
status = &podSyncStatus{
|
||||||
syncedAt: now,
|
syncedAt: now,
|
||||||
}
|
}
|
||||||
|
// if this pod is being synced for the first time, we need to make sure it is an active pod
|
||||||
|
if !isRuntimePod && (pod.Status.Phase == v1.PodFailed || pod.Status.Phase == v1.PodSucceeded) {
|
||||||
|
// check to see if the pod is not running and the pod is terminal.
|
||||||
|
// If this succeeds then record in the podWorker that it is terminated.
|
||||||
|
if statusCache, err := p.podCache.Get(pod.UID); err == nil {
|
||||||
|
if isPodStatusCacheTerminal(statusCache) {
|
||||||
|
status = &podSyncStatus{
|
||||||
|
terminatedAt: now,
|
||||||
|
terminatingAt: now,
|
||||||
|
syncedAt: now,
|
||||||
|
startedTerminating: true,
|
||||||
|
finished: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
p.podSyncStatuses[uid] = status
|
p.podSyncStatuses[uid] = status
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -140,6 +140,18 @@ func newPod(uid, name string) *v1.Pod {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func newPodWithPhase(uid, name string, phase v1.PodPhase) *v1.Pod {
|
||||||
|
return &v1.Pod{
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
UID: types.UID(uid),
|
||||||
|
Name: name,
|
||||||
|
},
|
||||||
|
Status: v1.PodStatus{
|
||||||
|
Phase: phase,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// syncPodRecord is a record of a sync pod call
|
// syncPodRecord is a record of a sync pod call
|
||||||
type syncPodRecord struct {
|
type syncPodRecord struct {
|
||||||
name string
|
name string
|
||||||
@ -273,6 +285,36 @@ func TestUpdatePod(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestUpdatePodWithTerminatedPod(t *testing.T) {
|
||||||
|
podWorkers, _ := createPodWorkers()
|
||||||
|
terminatedPod := newPodWithPhase("0000-0000-0000", "done-pod", v1.PodSucceeded)
|
||||||
|
runningPod := &kubecontainer.Pod{ID: "0000-0000-0001", Name: "done-pod"}
|
||||||
|
pod := newPod("0000-0000-0002", "running-pod")
|
||||||
|
|
||||||
|
podWorkers.UpdatePod(UpdatePodOptions{
|
||||||
|
Pod: terminatedPod,
|
||||||
|
UpdateType: kubetypes.SyncPodCreate,
|
||||||
|
})
|
||||||
|
podWorkers.UpdatePod(UpdatePodOptions{
|
||||||
|
Pod: pod,
|
||||||
|
UpdateType: kubetypes.SyncPodCreate,
|
||||||
|
})
|
||||||
|
podWorkers.UpdatePod(UpdatePodOptions{
|
||||||
|
UpdateType: kubetypes.SyncPodKill,
|
||||||
|
RunningPod: runningPod,
|
||||||
|
})
|
||||||
|
|
||||||
|
if podWorkers.IsPodKnownTerminated(pod.UID) == true {
|
||||||
|
t.Errorf("podWorker state should not be terminated")
|
||||||
|
}
|
||||||
|
if podWorkers.IsPodKnownTerminated(terminatedPod.UID) == false {
|
||||||
|
t.Errorf("podWorker state should be terminated")
|
||||||
|
}
|
||||||
|
if podWorkers.IsPodKnownTerminated(runningPod.ID) == true {
|
||||||
|
t.Errorf("podWorker state should not be marked terminated for a running pod")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestUpdatePodForRuntimePod(t *testing.T) {
|
func TestUpdatePodForRuntimePod(t *testing.T) {
|
||||||
podWorkers, processed := createPodWorkers()
|
podWorkers, processed := createPodWorkers()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user