Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the issue where node was not deleted when evicting pods timed out. #6154

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed the issue where node was not deleted when evicting pods timed out. #6154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions cluster-autoscaler/core/scaledown/actuation/group_deletion_scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,18 @@ func (ds *GroupDeletionScheduler) ScheduleDeletion(nodeInfo *framework.NodeInfo,

nodeDeleteResult := ds.prepareNodeForDeletion(nodeInfo, drain)
if nodeDeleteResult.Err != nil {
ds.AbortNodeDeletion(nodeInfo.Node(), nodeGroup.Id(), drain, "prepareNodeForDeletion failed", nodeDeleteResult)
return
isTimeout := true
for _, podEvictionResult := range nodeDeleteResult.PodEvictionResults {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC we should use this logic only if nodeDeleteResult.ResultType == status.NodeDeleteErrorFailedToEvictPods. In other cases the issue was not caused by timed out drain of pods, and so we should abort deletion.

// If there is any error message, it means it is not a pure timeout and node deletion is aborted.
if podEvictionResult.Err != nil {
isTimeout = false
break
}
}
if !isTimeout {
ds.AbortNodeDeletion(nodeInfo.Node(), nodeGroup.Id(), drain, "prepareNodeForDeletion failed", nodeDeleteResult)
return
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add some unit tests covering this change?

}

ds.addToBatcher(nodeInfo, nodeGroup, batchSize, drain, opts.ZeroOrMaxNodeScaling)
Expand Down
Loading