github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

scheduler: fix equiv. cache logging. 

Change the log messages to accurately reflect the cache behavior.
pull/8/head
Jonathan Basseri 2018-05-30 13:48:50 -07:00
parent c24842d806
commit 56b941f3df
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/scheduler/core/equivalence/eqivalence.go
View File

@ -162,7 +162,7 @@ func (c *Cache) updateResult(
equivalenceHash: predicateItem, equivalenceHash: predicateItem,
} }
} }
glog.V(5).Infof("Updated cached predicate: %v for pod: %v on node: %s, with item %v", predicateKey, podName, nodeName, predicateItem) glog.V(5).Infof("Cache update: node=%s,predicate=%s,pod=%s,value=%v", nodeName, predicateKey, podName, predicateItem)
} }
// lookupResult returns cached predicate results and a bool saying whether a // lookupResult returns cached predicate results and a bool saying whether a
@ -173,8 +173,7 @@ func (c *Cache) lookupResult(
) (value predicateResult, ok bool) { ) (value predicateResult, ok bool) {
c.mu.RLock() c.mu.RLock()
defer c.mu.RUnlock() defer c.mu.RUnlock()
glog.V(5).Infof("Begin to calculate predicate: %v for pod: %s on node: %s based on equivalence cache", glog.V(5).Infof("Cache lookup: node=%s,predicate=%s,pod=%s", nodeName, predicateKey, podName)
predicateKey, podName, nodeName)
value, ok = c.cache[nodeName][predicateKey][equivalenceHash] value, ok = c.cache[nodeName][predicateKey][equivalenceHash]
return value, ok return value, ok
} }
@ -192,7 +191,7 @@ func (c *Cache) InvalidatePredicates(predicateKeys sets.String) {
delete(predicates, predicateKey) delete(predicates, predicateKey)
} }
} }
glog.V(5).Infof("Done invalidating cached predicates: %v on all node", predicateKeys) glog.V(5).Infof("Cache invalidation: node=*,predicates=%v", predicateKeys)
} }
// InvalidatePredicatesOnNode clears cached results for the given predicates on one node. // InvalidatePredicatesOnNode clears cached results for the given predicates on one node.
@ -205,7 +204,7 @@ func (c *Cache) InvalidatePredicatesOnNode(nodeName string, predicateKeys sets.S
for predicateKey := range predicateKeys { for predicateKey := range predicateKeys {
delete(c.cache[nodeName], predicateKey) delete(c.cache[nodeName], predicateKey)
} }
glog.V(5).Infof("Done invalidating cached predicates: %v on node: %s", predicateKeys, nodeName) glog.V(5).Infof("Cache invalidation: node=%s,predicates=%v", nodeName, predicateKeys)
} }
// InvalidateAllPredicatesOnNode clears all cached results for one node. // InvalidateAllPredicatesOnNode clears all cached results for one node.
@ -213,7 +212,7 @@ func (c *Cache) InvalidateAllPredicatesOnNode(nodeName string) {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
delete(c.cache, nodeName) delete(c.cache, nodeName)
glog.V(5).Infof("Done invalidating all cached predicates on node: %s", nodeName) glog.V(5).Infof("Cache invalidation: node=%s,predicates=*", nodeName)
} }
// InvalidateCachedPredicateItemForPodAdd is a wrapper of // InvalidateCachedPredicateItemForPodAdd is a wrapper of