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

Jump to bottom

[release-1.5] 🐛 fix: deletion priority to avoid deleting too many machines #10429

Merged
merged 1 commit into from
Apr 15, 2024
Merged

[release-1.5] 🐛 fix: deletion priority to avoid deleting too many machines #10429

Show file tree
Hide file tree
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
13 changes: 7 additions & 6 deletions internal/controllers/machineset/machineset_delete_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ type (

const (
mustDelete deletePriority = 100.0
shouldDelete deletePriority = 75.0
betterDelete deletePriority = 50.0
couldDelete deletePriority = 20.0
mustNotDelete deletePriority = 0.0
Expand All @@ -48,10 +49,10 @@ func oldestDeletePriority(machine *clusterv1.Machine) deletePriority {
return mustDelete
}
if _, ok := machine.ObjectMeta.Annotations[clusterv1.DeleteMachineAnnotation]; ok {
return mustDelete
return shouldDelete
}
if !isMachineHealthy(machine) {
return mustDelete
return betterDelete
}
if machine.ObjectMeta.CreationTimestamp.Time.IsZero() {
return mustNotDelete
Expand All @@ -60,20 +61,20 @@ func oldestDeletePriority(machine *clusterv1.Machine) deletePriority {
if d.Seconds() < 0 {
return mustNotDelete
}
return deletePriority(float64(mustDelete) * (1.0 - math.Exp(-d.Seconds()/secondsPerTenDays)))
return deletePriority(float64(betterDelete) * (1.0 - math.Exp(-d.Seconds()/secondsPerTenDays)))
}

func newestDeletePriority(machine *clusterv1.Machine) deletePriority {
if !machine.DeletionTimestamp.IsZero() {
return mustDelete
}
if _, ok := machine.ObjectMeta.Annotations[clusterv1.DeleteMachineAnnotation]; ok {
return mustDelete
return shouldDelete
}
if !isMachineHealthy(machine) {
return mustDelete
return betterDelete
}
return mustDelete - oldestDeletePriority(machine)
return betterDelete - oldestDeletePriority(machine)
}

func randomDeletePolicy(machine *clusterv1.Machine) deletePriority {
Expand Down
29 changes: 29 additions & 0 deletions internal/controllers/machineset/machineset_delete_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,18 @@ func TestMachineOldestDelete(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.NewTime(currentTime.Time.AddDate(0, 0, -10))},
Status: clusterv1.MachineStatus{FailureReason: &statusError, NodeRef: nodeRef},
}
mustDeleteMachine := &clusterv1.Machine{
ObjectMeta: metav1.ObjectMeta{Name: "b", DeletionTimestamp: &currentTime},
Status: clusterv1.MachineStatus{NodeRef: nodeRef},
}
unhealthyMachineA := &clusterv1.Machine{
ObjectMeta: metav1.ObjectMeta{Name: "a", CreationTimestamp: metav1.NewTime(currentTime.Time.AddDate(0, 0, -10))},
Status: clusterv1.MachineStatus{FailureReason: &statusError, NodeRef: nodeRef},
}
unhealthyMachineZ := &clusterv1.Machine{
ObjectMeta: metav1.ObjectMeta{Name: "z", CreationTimestamp: metav1.NewTime(currentTime.Time.AddDate(0, 0, -10))},
Status: clusterv1.MachineStatus{FailureReason: &statusError, NodeRef: nodeRef},
}
deleteMachineWithoutNodeRef := &clusterv1.Machine{
ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.NewTime(currentTime.Time.AddDate(0, 0, -10))},
}
Expand Down Expand Up @@ -513,6 +525,23 @@ func TestMachineOldestDelete(t *testing.T) {
},
expect: []*clusterv1.Machine{nodeHealthyConditionUnknownMachine},
},
// these two cases ensures the mustDeleteMachine is always picked regardless of the machine names.
{
desc: "func=oldestDeletePriority, diff=1 (unhealthyMachineA)",
diff: 1,
machines: []*clusterv1.Machine{
empty, secondNewest, oldest, secondOldest, newest, mustDeleteMachine, unhealthyMachineA,
},
expect: []*clusterv1.Machine{mustDeleteMachine},
},
{
desc: "func=oldestDeletePriority, diff=1 (unhealthyMachineZ)",
diff: 1,
machines: []*clusterv1.Machine{
empty, secondNewest, oldest, secondOldest, newest, mustDeleteMachine, unhealthyMachineZ,
},
expect: []*clusterv1.Machine{mustDeleteMachine},
},
}

for _, test := range tests {
Expand Down
Loading