github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Return updatedPod if resize upon successful checkpointing of allocated resources

Browse Source
This commit is contained in:
vinay kulkarni 2023-03-22 00:24:00 +00:00
parent d753893260
commit f41702b8d2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/kubelet.go
View File

@ -1887,7 +1887,7 @@ func (kl *Kubelet) SyncPod(_ context.Context, updateType kubetypes.SyncPodType,
// TODO(vinaykul,InPlacePodVerticalScaling): Investigate doing this in HandlePodUpdates + periodic SyncLoop scan // TODO(vinaykul,InPlacePodVerticalScaling): Investigate doing this in HandlePodUpdates + periodic SyncLoop scan
// See: https://github.com/kubernetes/kubernetes/pull/102884#discussion_r663160060 // See: https://github.com/kubernetes/kubernetes/pull/102884#discussion_r663160060
if kl.podWorkers.CouldHaveRunningContainers(pod.UID) && !kubetypes.IsStaticPod(pod) { if kl.podWorkers.CouldHaveRunningContainers(pod.UID) && !kubetypes.IsStaticPod(pod) {
kl.handlePodResourcesResize(pod) pod = kl.handlePodResourcesResize(pod)
} }
} }
@ -2665,9 +2665,9 @@ func (kl *Kubelet) canResizePod(pod *v1.Pod) (bool, *v1.Pod, v1.PodResizeStatus)
return true, podCopy, v1.PodResizeStatusInProgress return true, podCopy, v1.PodResizeStatusInProgress
} }
func (kl *Kubelet) handlePodResourcesResize(pod *v1.Pod) { func (kl *Kubelet) handlePodResourcesResize(pod *v1.Pod) *v1.Pod {
if pod.Status.Phase != v1.PodRunning { if pod.Status.Phase != v1.PodRunning {
return return pod
} }
podResized := false podResized := false
for _, container := range pod.Spec.Containers { for _, container := range pod.Spec.Containers {
@ -2689,21 +2689,21 @@ func (kl *Kubelet) handlePodResourcesResize(pod *v1.Pod) {
} }
} }
if !podResized { if !podResized {
return return pod
} }
kl.podResizeMutex.Lock() kl.podResizeMutex.Lock()
defer kl.podResizeMutex.Unlock() defer kl.podResizeMutex.Unlock()
fit, updatedPod, resizeStatus := kl.canResizePod(pod) fit, updatedPod, resizeStatus := kl.canResizePod(pod)
if updatedPod == nil { if updatedPod == nil {
return return pod
} }
if fit { if fit {
// Update pod resource allocation checkpoint // Update pod resource allocation checkpoint
if err := kl.statusManager.SetPodAllocation(updatedPod); err != nil { if err := kl.statusManager.SetPodAllocation(updatedPod); err != nil {
//TODO(vinaykul,InPlacePodVerticalScaling): Can we recover from this in some way? Investigate //TODO(vinaykul,InPlacePodVerticalScaling): Can we recover from this in some way? Investigate
klog.ErrorS(err, "SetPodAllocation failed", "pod", klog.KObj(updatedPod)) klog.ErrorS(err, "SetPodAllocation failed", "pod", klog.KObj(updatedPod))
return return pod
} }
} }
if resizeStatus != "" { if resizeStatus != "" {
@ -2711,13 +2711,13 @@ func (kl *Kubelet) handlePodResourcesResize(pod *v1.Pod) {
if err := kl.statusManager.SetPodResizeStatus(updatedPod.UID, resizeStatus); err != nil { if err := kl.statusManager.SetPodResizeStatus(updatedPod.UID, resizeStatus); err != nil {
//TODO(vinaykul,InPlacePodVerticalScaling): Can we recover from this in some way? Investigate //TODO(vinaykul,InPlacePodVerticalScaling): Can we recover from this in some way? Investigate
klog.ErrorS(err, "SetPodResizeStatus failed", "pod", klog.KObj(updatedPod)) klog.ErrorS(err, "SetPodResizeStatus failed", "pod", klog.KObj(updatedPod))
return return pod
} }
updatedPod.Status.Resize = resizeStatus updatedPod.Status.Resize = resizeStatus
} }
kl.podManager.UpdatePod(updatedPod) kl.podManager.UpdatePod(updatedPod)
kl.statusManager.SetPodStatus(updatedPod, updatedPod.Status) kl.statusManager.SetPodStatus(updatedPod, updatedPod.Status)
return return updatedPod
} }
// LatestLoopEntryTime returns the last time in the sync loop monitor. // LatestLoopEntryTime returns the last time in the sync loop monitor.