Merge pull request kubernetes#75507 from hex108/skip

k8s-ci-robot · web-flow · commit efaf4f3bdbd5 · 2019-03-22T00:04:44.000-07:00
Avoid unnecessary sort for some cases in selectVictimsOnNode
diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go
@@ -1070,7 +1070,6 @@ func selectVictimsOnNode(
 			removePod(p)
 		}
 	}
-	potentialVictims.Sort()
 	// If the new pod does not fit after removing all the lower priority pods,
 	// we are almost done and this node is not suitable for preemption. The only
 	// condition that we could check is if the "pod" is failing to schedule due to
@@ -1085,6 +1084,7 @@ func selectVictimsOnNode(
 	}
 	var victims []*v1.Pod
 	numViolatingVictim := 0
+	potentialVictims.Sort()
 	// Try to reprieve as many pods as possible. We first try to reprieve the PDB
 	// violating victims and then other non-violating ones. In both cases, we start
 	// from the highest priority victims.

Original file line number	Diff line number	Diff line change
`@@ -1070,7 +1070,6 @@ func selectVictimsOnNode(`
`1070`	`1070`	`removePod(p)`
`1071`	`1071`	`}`
`1072`	`1072`	`}`
`1073`		`- potentialVictims.Sort()`
`1074`	`1073`	`// If the new pod does not fit after removing all the lower priority pods,`
`1075`	`1074`	`// we are almost done and this node is not suitable for preemption. The only`
`1076`	`1075`	`// condition that we could check is if the "pod" is failing to schedule due to`
`@@ -1085,6 +1084,7 @@ func selectVictimsOnNode(`
`1085`	`1084`	`}`
`1086`	`1085`	`var victims []*v1.Pod`
`1087`	`1086`	`numViolatingVictim := 0`
	`1087`	`+ potentialVictims.Sort()`
`1088`	`1088`	`// Try to reprieve as many pods as possible. We first try to reprieve the PDB`
`1089`	`1089`	`// violating victims and then other non-violating ones. In both cases, we start`
`1090`	`1090`	`// from the highest priority victims.`