Skip to content

K
k3s
Unverified Commit dd040d60 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63942 from misterikkit/ecache-cleanup

Automatic merge from submit-queue (batch tested with PRs 64142, 64426, 62910, 63942, 64548). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. scheduler: further cleanup of equivalence cache **What this PR does / why we need it**: This improves comments and simplifies some names/logic in equivalence_cache.go, as well as changing the order of some items in the file. **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /kind cleanup
parents fea9a3f1 ba08b05e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 55 deletions
pkg/scheduler/core/equivalence_cache_test.go
View file @ dd040d60
...@@ -251,7 +251,7 @@ func TestRunPredicate(t *testing.T) { ...@@ -251,7 +251,7 @@ func TestRunPredicate(t *testing.T) {
meta := algorithm.EmptyPredicateMetadataProducer(nil, nil) meta := algorithm.EmptyPredicateMetadataProducer(nil, nil)
ecache := NewEquivalenceCache() ecache := NewEquivalenceCache()
equivClass := ecache.getEquivalenceClassInfo(pod) equivClass := ecache.GetEquivalenceClassInfo(pod)
if test.expectCacheHit { if test.expectCacheHit {
ecache.updateResult(pod.Name, "testPredicate", test.expectFit, test.expectedReasons, equivClass.hash, test.cache, node) ecache.updateResult(pod.Name, "testPredicate", test.expectFit, test.expectedReasons, equivClass.hash, test.cache, node)
} }
...@@ -287,14 +287,14 @@ func TestRunPredicate(t *testing.T) { ...@@ -287,14 +287,14 @@ func TestRunPredicate(t *testing.T) {
if !test.expectCacheHit && test.pred.callCount == 0 { if !test.expectCacheHit && test.pred.callCount == 0 {
t.Errorf("Predicate should be called") t.Errorf("Predicate should be called")
} }
_, _, invalid := ecache.lookupResult(pod.Name, node.Node().Name, "testPredicate", equivClass.hash) _, ok := ecache.lookupResult(pod.Name, node.Node().Name, "testPredicate", equivClass.hash)
if invalid && test.expectCacheWrite { if !ok && test.expectCacheWrite {
t.Errorf("Cache write should happen") t.Errorf("Cache write should happen")
} }
if !test.expectCacheHit && test.expectCacheWrite && invalid { if !test.expectCacheHit && test.expectCacheWrite && !ok {
t.Errorf("Cache write should happen") t.Errorf("Cache write should happen")
} }
if !test.expectCacheHit && !test.expectCacheWrite && !invalid { if !test.expectCacheHit && !test.expectCacheWrite && ok {
t.Errorf("Cache write should not happen") t.Errorf("Cache write should not happen")
} }
}) })
...@@ -311,7 +311,7 @@ func TestUpdateResult(t *testing.T) { ...@@ -311,7 +311,7 @@ func TestUpdateResult(t *testing.T) {
reasons []algorithm.PredicateFailureReason reasons []algorithm.PredicateFailureReason
equivalenceHash uint64 equivalenceHash uint64
expectPredicateMap bool expectPredicateMap bool
expectCacheItem HostPredicate expectCacheItem predicateResult
cache schedulercache.Cache cache schedulercache.Cache
}{ }{
{ {
...@@ -322,7 +322,7 @@ func TestUpdateResult(t *testing.T) { ...@@ -322,7 +322,7 @@ func TestUpdateResult(t *testing.T) {
fit: true, fit: true,
equivalenceHash: 123, equivalenceHash: 123,
expectPredicateMap: false, expectPredicateMap: false,
expectCacheItem: HostPredicate{ expectCacheItem: predicateResult{
Fit: true, Fit: true,
}, },
cache: &upToDateCache{}, cache: &upToDateCache{},
...@@ -335,7 +335,7 @@ func TestUpdateResult(t *testing.T) { ...@@ -335,7 +335,7 @@ func TestUpdateResult(t *testing.T) {
fit: false, fit: false,
equivalenceHash: 123, equivalenceHash: 123,
expectPredicateMap: true, expectPredicateMap: true,
expectCacheItem: HostPredicate{ expectCacheItem: predicateResult{
Fit: false, Fit: false,
}, },
cache: &upToDateCache{}, cache: &upToDateCache{},
...@@ -344,12 +344,12 @@ func TestUpdateResult(t *testing.T) { ...@@ -344,12 +344,12 @@ func TestUpdateResult(t *testing.T) {
for _, test := range tests { for _, test := range tests {
ecache := NewEquivalenceCache() ecache := NewEquivalenceCache()
if test.expectPredicateMap { if test.expectPredicateMap {
ecache.algorithmCache[test.nodeName] = AlgorithmCache{} ecache.cache[test.nodeName] = make(predicateMap)
predicateItem := HostPredicate{ predicateItem := predicateResult{
Fit: true, Fit: true,
} }
ecache.algorithmCache[test.nodeName][test.predicateKey] = ecache.cache[test.nodeName][test.predicateKey] =
PredicateMap{ resultMap{
test.equivalenceHash: predicateItem, test.equivalenceHash: predicateItem,
} }
} }
...@@ -366,7 +366,7 @@ func TestUpdateResult(t *testing.T) { ...@@ -366,7 +366,7 @@ func TestUpdateResult(t *testing.T) {
node, node,
) )
cachedMapItem, ok := ecache.algorithmCache[test.nodeName][test.predicateKey] cachedMapItem, ok := ecache.cache[test.nodeName][test.predicateKey]
if !ok { if !ok {
t.Errorf("Failed: %s, can't find expected cache item: %v", t.Errorf("Failed: %s, can't find expected cache item: %v",
test.name, test.expectCacheItem) test.name, test.expectCacheItem)
...@@ -396,8 +396,8 @@ func TestLookupResult(t *testing.T) { ...@@ -396,8 +396,8 @@ func TestLookupResult(t *testing.T) {
equivalenceHashForUpdatePredicate uint64 equivalenceHashForUpdatePredicate uint64
equivalenceHashForCalPredicate uint64 equivalenceHashForCalPredicate uint64
cachedItem predicateItemType cachedItem predicateItemType
expectedInvalidPredicateKey bool expectedPredicateKeyMiss bool
expectedInvalidEquivalenceHash bool expectedEquivalenceHashMiss bool
expectedPredicateItem predicateItemType expectedPredicateItem predicateItemType
cache schedulercache.Cache cache schedulercache.Cache
}{ }{
...@@ -412,7 +412,7 @@ func TestLookupResult(t *testing.T) { ...@@ -412,7 +412,7 @@ func TestLookupResult(t *testing.T) {
fit: false, fit: false,
reasons: []algorithm.PredicateFailureReason{predicates.ErrPodNotFitsHostPorts}, reasons: []algorithm.PredicateFailureReason{predicates.ErrPodNotFitsHostPorts},
}, },
expectedInvalidPredicateKey: true, expectedPredicateKeyMiss: true,
expectedPredicateItem: predicateItemType{ expectedPredicateItem: predicateItemType{
fit: false, fit: false,
reasons: []algorithm.PredicateFailureReason{}, reasons: []algorithm.PredicateFailureReason{},
...@@ -429,7 +429,7 @@ func TestLookupResult(t *testing.T) { ...@@ -429,7 +429,7 @@ func TestLookupResult(t *testing.T) {
cachedItem: predicateItemType{ cachedItem: predicateItemType{
fit: true, fit: true,
}, },
expectedInvalidPredicateKey: false, expectedPredicateKeyMiss: false,
expectedPredicateItem: predicateItemType{ expectedPredicateItem: predicateItemType{
fit: true, fit: true,
reasons: []algorithm.PredicateFailureReason{}, reasons: []algorithm.PredicateFailureReason{},
...@@ -447,7 +447,7 @@ func TestLookupResult(t *testing.T) { ...@@ -447,7 +447,7 @@ func TestLookupResult(t *testing.T) {
fit: false, fit: false,
reasons: []algorithm.PredicateFailureReason{predicates.ErrPodNotFitsHostPorts}, reasons: []algorithm.PredicateFailureReason{predicates.ErrPodNotFitsHostPorts},
}, },
expectedInvalidPredicateKey: false, expectedPredicateKeyMiss: false,
expectedPredicateItem: predicateItemType{ expectedPredicateItem: predicateItemType{
fit: false, fit: false,
reasons: []algorithm.PredicateFailureReason{predicates.ErrPodNotFitsHostPorts}, reasons: []algorithm.PredicateFailureReason{predicates.ErrPodNotFitsHostPorts},
...@@ -465,8 +465,8 @@ func TestLookupResult(t *testing.T) { ...@@ -465,8 +465,8 @@ func TestLookupResult(t *testing.T) {
fit: false, fit: false,
reasons: []algorithm.PredicateFailureReason{predicates.ErrPodNotFitsHostPorts}, reasons: []algorithm.PredicateFailureReason{predicates.ErrPodNotFitsHostPorts},
}, },
expectedInvalidPredicateKey: false, expectedPredicateKeyMiss: false,
expectedInvalidEquivalenceHash: true, expectedEquivalenceHashMiss: true,
expectedPredicateItem: predicateItemType{ expectedPredicateItem: predicateItemType{
fit: false, fit: false,
reasons: []algorithm.PredicateFailureReason{}, reasons: []algorithm.PredicateFailureReason{},
...@@ -490,27 +490,32 @@ func TestLookupResult(t *testing.T) { ...@@ -490,27 +490,32 @@ func TestLookupResult(t *testing.T) {
node, node,
) )
// if we want to do invalid, invalid the cached item // if we want to do invalid, invalid the cached item
if test.expectedInvalidPredicateKey { if test.expectedPredicateKeyMiss {
predicateKeys := sets.NewString() predicateKeys := sets.NewString()
predicateKeys.Insert(test.predicateKey) predicateKeys.Insert(test.predicateKey)
ecache.InvalidateCachedPredicateItem(test.nodeName, predicateKeys) ecache.InvalidatePredicatesOnNode(test.nodeName, predicateKeys)
} }
// calculate predicate with equivalence cache // calculate predicate with equivalence cache
fit, reasons, invalid := ecache.lookupResult(test.podName, result, ok := ecache.lookupResult(test.podName,
test.nodeName, test.nodeName,
test.predicateKey, test.predicateKey,
test.equivalenceHashForCalPredicate, test.equivalenceHashForCalPredicate,
) )
// returned invalid should match expectedInvalidPredicateKey or expectedInvalidEquivalenceHash fit, reasons := result.Fit, result.FailReasons
// returned invalid should match expectedPredicateKeyMiss or expectedEquivalenceHashMiss
if test.equivalenceHashForUpdatePredicate != test.equivalenceHashForCalPredicate { if test.equivalenceHashForUpdatePredicate != test.equivalenceHashForCalPredicate {
if invalid != test.expectedInvalidEquivalenceHash { if ok && test.expectedEquivalenceHashMiss {
t.Errorf("Failed: %s, expected invalid: %v, but got: %v", t.Errorf("Failed: %s, expected (equivalence hash) cache miss", test.name)
test.name, test.expectedInvalidEquivalenceHash, invalid) }
if !ok && !test.expectedEquivalenceHashMiss {
t.Errorf("Failed: %s, expected (equivalence hash) cache hit", test.name)
} }
} else { } else {
if invalid != test.expectedInvalidPredicateKey { if ok && test.expectedPredicateKeyMiss {
t.Errorf("Failed: %s, expected invalid: %v, but got: %v", t.Errorf("Failed: %s, expected (predicate key) cache miss", test.name)
test.name, test.expectedInvalidPredicateKey, invalid) }
if !ok && !test.expectedPredicateKeyMiss {
t.Errorf("Failed: %s, expected (predicate key) cache hit", test.name)
} }
} }
// returned predicate result should match expected predicate item // returned predicate result should match expected predicate item
...@@ -618,7 +623,7 @@ func TestGetEquivalenceHash(t *testing.T) { ...@@ -618,7 +623,7 @@ func TestGetEquivalenceHash(t *testing.T) {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
for i, podInfo := range test.podInfoList { for i, podInfo := range test.podInfoList {
testPod := podInfo.pod testPod := podInfo.pod
eclassInfo := ecache.getEquivalenceClassInfo(testPod) eclassInfo := ecache.GetEquivalenceClassInfo(testPod)
if eclassInfo == nil && podInfo.hashIsValid { if eclassInfo == nil && podInfo.hashIsValid {
t.Errorf("Failed: pod %v is expected to have valid hash", testPod) t.Errorf("Failed: pod %v is expected to have valid hash", testPod)
} }
...@@ -704,11 +709,11 @@ func TestInvalidateCachedPredicateItemOfAllNodes(t *testing.T) { ...@@ -704,11 +709,11 @@ func TestInvalidateCachedPredicateItemOfAllNodes(t *testing.T) {
} }
// invalidate cached predicate for all nodes // invalidate cached predicate for all nodes
ecache.InvalidateCachedPredicateItemOfAllNodes(sets.NewString(testPredicate)) ecache.InvalidatePredicates(sets.NewString(testPredicate))
// there should be no cached predicate any more // there should be no cached predicate any more
for _, test := range tests { for _, test := range tests {
if algorithmCache, exist := ecache.algorithmCache[test.nodeName]; exist { if algorithmCache, exist := ecache.cache[test.nodeName]; exist {
if _, exist := algorithmCache[testPredicate]; exist { if _, exist := algorithmCache[testPredicate]; exist {
t.Errorf("Failed: cached item for predicate key: %v on node: %v should be invalidated", t.Errorf("Failed: cached item for predicate key: %v on node: %v should be invalidated",
testPredicate, test.nodeName) testPredicate, test.nodeName)
...@@ -777,8 +782,8 @@ func TestInvalidateAllCachedPredicateItemOfNode(t *testing.T) { ...@@ -777,8 +782,8 @@ func TestInvalidateAllCachedPredicateItemOfNode(t *testing.T) {
for _, test := range tests { for _, test := range tests {
// invalidate cached predicate for all nodes // invalidate cached predicate for all nodes
ecache.InvalidateAllCachedPredicateItemOfNode(test.nodeName) ecache.InvalidateAllPredicatesOnNode(test.nodeName)
if _, exist := ecache.algorithmCache[test.nodeName]; exist { if _, exist := ecache.cache[test.nodeName]; exist {
t.Errorf("Failed: cached item for node: %v should be invalidated", test.nodeName) t.Errorf("Failed: cached item for node: %v should be invalidated", test.nodeName)
break break
} }
...@@ -788,7 +793,7 @@ func TestInvalidateAllCachedPredicateItemOfNode(t *testing.T) { ...@@ -788,7 +793,7 @@ func TestInvalidateAllCachedPredicateItemOfNode(t *testing.T) {
func BenchmarkEquivalenceHash(b *testing.B) { func BenchmarkEquivalenceHash(b *testing.B) {
pod := makeBasicPod("test") pod := makeBasicPod("test")
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
getEquivalenceHash(pod) getEquivalencePod(pod)
} }
} }
...@@ -852,7 +857,7 @@ func TestEquivalenceCacheInvalidationRace(t *testing.T) { ...@@ -852,7 +857,7 @@ func TestEquivalenceCacheInvalidationRace(t *testing.T) {
if err := cache.AddPod(pod); err != nil { if err := cache.AddPod(pod); err != nil {
t.Errorf("Could not add pod to cache: %v", err) t.Errorf("Could not add pod to cache: %v", err)
} }
eCache.InvalidateAllCachedPredicateItemOfNode("machine1") eCache.InvalidateAllPredicatesOnNode("machine1")
mockCache.cacheInvalidated <- struct{}{} mockCache.cacheInvalidated <- struct{}{}
}() }()
......
pkg/scheduler/core/generic_scheduler.go
View file @ dd040d60
...@@ -342,10 +342,10 @@ func (g *genericScheduler) findNodesThatFit(pod *v1.Pod, nodes []*v1.Node) ([]*v ...@@ -342,10 +342,10 @@ func (g *genericScheduler) findNodesThatFit(pod *v1.Pod, nodes []*v1.Node) ([]*v
// We can use the same metadata producer for all nodes. // We can use the same metadata producer for all nodes.
meta := g.predicateMetaProducer(pod, g.cachedNodeInfoMap) meta := g.predicateMetaProducer(pod, g.cachedNodeInfoMap)
var equivCacheInfo *equivalenceClassInfo var equivCacheInfo *EquivalenceClassInfo
if g.equivalenceCache != nil { if g.equivalenceCache != nil {
// getEquivalenceClassInfo will return immediately if no equivalence pod found // getEquivalenceClassInfo will return immediately if no equivalence pod found
equivCacheInfo = g.equivalenceCache.getEquivalenceClassInfo(pod) equivCacheInfo = g.equivalenceCache.GetEquivalenceClassInfo(pod)
} }
checkNode := func(i int) { checkNode := func(i int) {
...@@ -462,7 +462,7 @@ func podFitsOnNode( ...@@ -462,7 +462,7 @@ func podFitsOnNode(
ecache *EquivalenceCache, ecache *EquivalenceCache,
queue SchedulingQueue, queue SchedulingQueue,
alwaysCheckAllPredicates bool, alwaysCheckAllPredicates bool,
equivCacheInfo *equivalenceClassInfo, equivCacheInfo *EquivalenceClassInfo,
) (bool, []algorithm.PredicateFailureReason, error) { ) (bool, []algorithm.PredicateFailureReason, error) {
var ( var (
eCacheAvailable bool eCacheAvailable bool
......
pkg/scheduler/factory/factory.go
View file @ dd040d60
...@@ -410,7 +410,7 @@ func (c *configFactory) invalidatePredicatesForPvUpdate(oldPV, newPV *v1.Persist ...@@ -410,7 +410,7 @@ func (c *configFactory) invalidatePredicatesForPvUpdate(oldPV, newPV *v1.Persist
break break
} }
} }
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes(invalidPredicates) c.equivalencePodCache.InvalidatePredicates(invalidPredicates)
} }
// isZoneRegionLabel check if given key of label is zone or region label. // isZoneRegionLabel check if given key of label is zone or region label.
...@@ -468,7 +468,7 @@ func (c *configFactory) invalidatePredicatesForPv(pv *v1.PersistentVolume) { ...@@ -468,7 +468,7 @@ func (c *configFactory) invalidatePredicatesForPv(pv *v1.PersistentVolume) {
invalidPredicates.Insert(predicates.CheckVolumeBindingPred) invalidPredicates.Insert(predicates.CheckVolumeBindingPred)
} }
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes(invalidPredicates) c.equivalencePodCache.InvalidatePredicates(invalidPredicates)
} }
func (c *configFactory) onPvcAdd(obj interface{}) { func (c *configFactory) onPvcAdd(obj interface{}) {
...@@ -538,7 +538,7 @@ func (c *configFactory) invalidatePredicatesForPvc(pvc *v1.PersistentVolumeClaim ...@@ -538,7 +538,7 @@ func (c *configFactory) invalidatePredicatesForPvc(pvc *v1.PersistentVolumeClaim
// Add/delete impacts the available PVs to choose from // Add/delete impacts the available PVs to choose from
invalidPredicates.Insert(predicates.CheckVolumeBindingPred) invalidPredicates.Insert(predicates.CheckVolumeBindingPred)
} }
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes(invalidPredicates) c.equivalencePodCache.InvalidatePredicates(invalidPredicates)
} }
func (c *configFactory) invalidatePredicatesForPvcUpdate(old, new *v1.PersistentVolumeClaim) { func (c *configFactory) invalidatePredicatesForPvcUpdate(old, new *v1.PersistentVolumeClaim) {
...@@ -553,12 +553,12 @@ func (c *configFactory) invalidatePredicatesForPvcUpdate(old, new *v1.Persistent ...@@ -553,12 +553,12 @@ func (c *configFactory) invalidatePredicatesForPvcUpdate(old, new *v1.Persistent
invalidPredicates.Insert(maxPDVolumeCountPredicateKeys...) invalidPredicates.Insert(maxPDVolumeCountPredicateKeys...)
} }
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes(invalidPredicates) c.equivalencePodCache.InvalidatePredicates(invalidPredicates)
} }
func (c *configFactory) onServiceAdd(obj interface{}) { func (c *configFactory) onServiceAdd(obj interface{}) {
if c.enableEquivalenceClassCache { if c.enableEquivalenceClassCache {
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes(serviceAffinitySet) c.equivalencePodCache.InvalidatePredicates(serviceAffinitySet)
} }
c.podQueue.MoveAllToActiveQueue() c.podQueue.MoveAllToActiveQueue()
} }
...@@ -569,7 +569,7 @@ func (c *configFactory) onServiceUpdate(oldObj interface{}, newObj interface{}) ...@@ -569,7 +569,7 @@ func (c *configFactory) onServiceUpdate(oldObj interface{}, newObj interface{})
oldService := oldObj.(*v1.Service) oldService := oldObj.(*v1.Service)
newService := newObj.(*v1.Service) newService := newObj.(*v1.Service)
if !reflect.DeepEqual(oldService.Spec.Selector, newService.Spec.Selector) { if !reflect.DeepEqual(oldService.Spec.Selector, newService.Spec.Selector) {
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes(serviceAffinitySet) c.equivalencePodCache.InvalidatePredicates(serviceAffinitySet)
} }
} }
c.podQueue.MoveAllToActiveQueue() c.podQueue.MoveAllToActiveQueue()
...@@ -577,7 +577,7 @@ func (c *configFactory) onServiceUpdate(oldObj interface{}, newObj interface{}) ...@@ -577,7 +577,7 @@ func (c *configFactory) onServiceUpdate(oldObj interface{}, newObj interface{})
func (c *configFactory) onServiceDelete(obj interface{}) { func (c *configFactory) onServiceDelete(obj interface{}) {
if c.enableEquivalenceClassCache { if c.enableEquivalenceClassCache {
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes(serviceAffinitySet) c.equivalencePodCache.InvalidatePredicates(serviceAffinitySet)
} }
c.podQueue.MoveAllToActiveQueue() c.podQueue.MoveAllToActiveQueue()
} }
...@@ -694,13 +694,13 @@ func (c *configFactory) invalidateCachedPredicatesOnUpdatePod(newPod *v1.Pod, ol ...@@ -694,13 +694,13 @@ func (c *configFactory) invalidateCachedPredicatesOnUpdatePod(newPod *v1.Pod, ol
if !reflect.DeepEqual(oldPod.GetLabels(), newPod.GetLabels()) { if !reflect.DeepEqual(oldPod.GetLabels(), newPod.GetLabels()) {
// MatchInterPodAffinity need to be reconsidered for this node, // MatchInterPodAffinity need to be reconsidered for this node,
// as well as all nodes in its same failure domain. // as well as all nodes in its same failure domain.
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes( c.equivalencePodCache.InvalidatePredicates(
matchInterPodAffinitySet) matchInterPodAffinitySet)
} }
// if requested container resource changed, invalidate GeneralPredicates of this node // if requested container resource changed, invalidate GeneralPredicates of this node
if !reflect.DeepEqual(predicates.GetResourceRequest(newPod), if !reflect.DeepEqual(predicates.GetResourceRequest(newPod),
predicates.GetResourceRequest(oldPod)) { predicates.GetResourceRequest(oldPod)) {
c.equivalencePodCache.InvalidateCachedPredicateItem( c.equivalencePodCache.InvalidatePredicatesOnNode(
newPod.Spec.NodeName, generalPredicatesSets) newPod.Spec.NodeName, generalPredicatesSets)
} }
} }
...@@ -741,14 +741,14 @@ func (c *configFactory) invalidateCachedPredicatesOnDeletePod(pod *v1.Pod) { ...@@ -741,14 +741,14 @@ func (c *configFactory) invalidateCachedPredicatesOnDeletePod(pod *v1.Pod) {
// MatchInterPodAffinity need to be reconsidered for this node, // MatchInterPodAffinity need to be reconsidered for this node,
// as well as all nodes in its same failure domain. // as well as all nodes in its same failure domain.
// TODO(resouer) can we just do this for nodes in the same failure domain // TODO(resouer) can we just do this for nodes in the same failure domain
c.equivalencePodCache.InvalidateCachedPredicateItemOfAllNodes( c.equivalencePodCache.InvalidatePredicates(
matchInterPodAffinitySet) matchInterPodAffinitySet)
// if this pod have these PV, cached result of disk conflict will become invalid. // if this pod have these PV, cached result of disk conflict will become invalid.
for _, volume := range pod.Spec.Volumes { for _, volume := range pod.Spec.Volumes {
if volume.GCEPersistentDisk != nil || volume.AWSElasticBlockStore != nil || if volume.GCEPersistentDisk != nil || volume.AWSElasticBlockStore != nil ||
volume.RBD != nil || volume.ISCSI != nil { volume.RBD != nil || volume.ISCSI != nil {
c.equivalencePodCache.InvalidateCachedPredicateItem( c.equivalencePodCache.InvalidatePredicatesOnNode(
pod.Spec.NodeName, noDiskConflictSet) pod.Spec.NodeName, noDiskConflictSet)
} }
} }
...@@ -858,7 +858,7 @@ func (c *configFactory) invalidateCachedPredicatesOnNodeUpdate(newNode *v1.Node, ...@@ -858,7 +858,7 @@ func (c *configFactory) invalidateCachedPredicatesOnNodeUpdate(newNode *v1.Node,
if newNode.Spec.Unschedulable != oldNode.Spec.Unschedulable { if newNode.Spec.Unschedulable != oldNode.Spec.Unschedulable {
invalidPredicates.Insert(predicates.CheckNodeConditionPred) invalidPredicates.Insert(predicates.CheckNodeConditionPred)
} }
c.equivalencePodCache.InvalidateCachedPredicateItem(newNode.GetName(), invalidPredicates) c.equivalencePodCache.InvalidatePredicatesOnNode(newNode.GetName(), invalidPredicates)
} }
} }
...@@ -885,7 +885,7 @@ func (c *configFactory) deleteNodeFromCache(obj interface{}) { ...@@ -885,7 +885,7 @@ func (c *configFactory) deleteNodeFromCache(obj interface{}) {
glog.Errorf("scheduler cache RemoveNode failed: %v", err) glog.Errorf("scheduler cache RemoveNode failed: %v", err)
} }
if c.enableEquivalenceClassCache { if c.enableEquivalenceClassCache {
c.equivalencePodCache.InvalidateAllCachedPredicateItemOfNode(node.GetName()) c.equivalencePodCache.InvalidateAllPredicatesOnNode(node.GetName())
} }
} }
...@@ -1315,7 +1315,7 @@ func (c *configFactory) MakeDefaultErrorFunc(backoff *util.PodBackoff, podQueue ...@@ -1315,7 +1315,7 @@ func (c *configFactory) MakeDefaultErrorFunc(backoff *util.PodBackoff, podQueue
c.schedulerCache.RemoveNode(&node) c.schedulerCache.RemoveNode(&node)
// invalidate cached predicate for the node // invalidate cached predicate for the node
if c.enableEquivalenceClassCache { if c.enableEquivalenceClassCache {
c.equivalencePodCache.InvalidateAllCachedPredicateItemOfNode(nodeName) c.equivalencePodCache.InvalidateAllPredicatesOnNode(nodeName)
} }
} }
} }
......
pkg/scheduler/scheduler.go
View file @ dd040d60
...@@ -284,7 +284,7 @@ func (sched *Scheduler) assumeAndBindVolumes(assumed *v1.Pod, host string) error ...@@ -284,7 +284,7 @@ func (sched *Scheduler) assumeAndBindVolumes(assumed *v1.Pod, host string) error
if bindingRequired { if bindingRequired {
if sched.config.Ecache != nil { if sched.config.Ecache != nil {
invalidPredicates := sets.NewString(predicates.CheckVolumeBindingPred) invalidPredicates := sets.NewString(predicates.CheckVolumeBindingPred)
sched.config.Ecache.InvalidateCachedPredicateItemOfAllNodes(invalidPredicates) sched.config.Ecache.InvalidatePredicates(invalidPredicates)
} }
// bindVolumesWorker() will update the Pod object to put it back in the scheduler queue // bindVolumesWorker() will update the Pod object to put it back in the scheduler queue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment