Fix equiv. cache invalidation of Node condition.

Equivalence cache for CheckNodeConditionPred becomes invalid when Node.Spec.Unschedulable changes. This can happen even if Node.Status.Conditions does not change, so move the logic around. This logic is covered by integration test "test/integration/scheduler".TestUnschedulableNodes but equivalence cache is currently skipped when test pods have no OwnerReference.

Fix equiv. cache invalidation of Node condition.
59f0a999 · Jonathan Basseri · cdf26b05 · 59f0a999
Commit 59f0a999 authored Jan 24, 2018 by Jonathan Basseri
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

factory.go pkg/scheduler/factory/factory.go +4 -2

No files found.
--- a/pkg/scheduler/factory/factory.go
+++ b/pkg/scheduler/factory/factory.go
@@ -781,11 +781,13 @@ func (c *configFactory) invalidateCachedPredicatesOnNodeUpdate(newNode *v1.Node,
 			}
 			if oldConditions[v1.NodeReady] != newConditions[v1.NodeReady] ||
 				oldConditions[v1.NodeOutOfDisk] != newConditions[v1.NodeOutOfDisk] ||
-				oldConditions[v1.NodeNetworkUnavailable] != newConditions[v1.NodeNetworkUnavailable] ||
+				oldConditions[v1.NodeNetworkUnavailable] != newConditions[v1.NodeNetworkUnavailable] {
-				newNode.Spec.Unschedulable != oldNode.Spec.Unschedulable {
 				invalidPredicates.Insert("CheckNodeCondition")
 			}
 		}
+		if newNode.Spec.Unschedulable != oldNode.Spec.Unschedulable {
+			invalidPredicates.Insert("CheckNodeCondition")
+		}
 		c.equivalencePodCache.InvalidateCachedPredicateItem(newNode.GetName(), invalidPredicates)
 	}
 }