Add unit test for long-terminating pod past grace period

Capillary · Oct 10, 2023 · 33e300f · 33e300f
1 parent 9a7459c
commit 33e300f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/cluster-autoscaler/simulator/drain.go b/cluster-autoscaler/simulator/drain.go
@@ -55,9 +55,6 @@ func GetPodsToMove(nodeInfo *schedulerframework.NodeInfo, deleteOptions options.
 		status := drainabilityRules.Drainable(drainCtx, pod)
 		switch status.Outcome {
 		case drainability.UndefinedOutcome, drainability.DrainOk:
-			if drain.IsPodLongTerminating(pod, timestamp) {
-				continue
-			}
 			if pod_util.IsDaemonSetPod(pod) {
 				daemonSetPods = append(daemonSetPods, pod)
 			} else {

diff --git a/cluster-autoscaler/simulator/drainability/rules/longterminating/rule_test.go b/cluster-autoscaler/simulator/drainability/rules/longterminating/rule_test.go
@@ -47,6 +47,23 @@ func TestDrainable(t *testing.T) {
 			want: drainability.NewUndefinedStatus(),
 		},
 		"long terminating pod with 0 grace period": {
+			pod: &apiv1.Pod{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:              "bar",
+					Namespace:         "default",
+					DeletionTimestamp: &metav1.Time{Time: testTime.Add(drain.PodLongTerminatingExtraThreshold / 2)},
+				},
+				Spec: apiv1.PodSpec{
+					RestartPolicy:                 apiv1.RestartPolicyOnFailure,
+					TerminationGracePeriodSeconds: &zeroGracePeriod,
+				},
+				Status: apiv1.PodStatus{
+					Phase: apiv1.PodUnknown,
+				},
+			},
+			want: drainability.NewUndefinedStatus(),
+		},
+		"expired long terminating pod with 0 grace period": {
 			pod: &apiv1.Pod{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:              "bar",
@@ -64,6 +81,23 @@ func TestDrainable(t *testing.T) {
 			want: drainability.NewSkipStatus(),
 		},
 		"long terminating pod with extended grace period": {
+			pod: &apiv1.Pod{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:              "bar",
+					Namespace:         "default",
+					DeletionTimestamp: &metav1.Time{Time: testTime.Add(time.Duration(extendedGracePeriod) / 2 * time.Second)},
+				},
+				Spec: apiv1.PodSpec{
+					RestartPolicy:                 apiv1.RestartPolicyOnFailure,
+					TerminationGracePeriodSeconds: &extendedGracePeriod,
+				},
+				Status: apiv1.PodStatus{
+					Phase: apiv1.PodUnknown,
+				},
+			},
+			want: drainability.NewUndefinedStatus(),
+		},
+		"expired long terminating pod with extended grace period": {
 			pod: &apiv1.Pod{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:              "bar",