Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add type to xds cache evictions stat #39853

Merged
merged 2 commits into from
Jul 11, 2022
Merged

add type to xds cache evictions stat #39853

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
510e04d
add type to xds cache evictions stat
ramaraochavali Jul 11, 2022
a421f76
revert unnecessary change
ramaraochavali Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions pilot/pkg/model/xds_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ var (
xdsCacheEvictions = monitoring.NewSum(
"xds_cache_evictions",
"Total number of xds cache evictions.",
monitoring.WithLabels(typeTag),
)

xdsCacheSize = monitoring.NewGauge(
Expand All @@ -59,8 +60,10 @@ var (
"Current size of dependent configs",
)

xdsCacheHits = xdsCacheReads.With(typeTag.Value("hit"))
xdsCacheMisses = xdsCacheReads.With(typeTag.Value("miss"))
xdsCacheHits = xdsCacheReads.With(typeTag.Value("hit"))
xdsCacheMisses = xdsCacheReads.With(typeTag.Value("miss"))
xdsCacheEvictsionsOnClear = xdsCacheEvictions.With(typeTag.Value("clear"))
xdsCacheEvictsionsOnSize = xdsCacheEvictions.With(typeTag.Value("size"))
)

func hit() {
Expand Down Expand Up @@ -128,7 +131,7 @@ func NewXdsCache() XdsCache {
configIndex: map[ConfigHash]sets.Set{},
typesIndex: map[kind.Kind]sets.Set{},
}
cache.store = newLru(cache.evict)
cache.store = newLru(cache.onEvict)

return cache
}
Expand All @@ -140,7 +143,7 @@ func NewLenientXdsCache() XdsCache {
configIndex: map[ConfigHash]sets.Set{},
typesIndex: map[kind.Kind]sets.Set{},
}
cache.store = newLru(cache.evict)
cache.store = newLru(cache.onEvict)

return cache
}
Expand All @@ -155,8 +158,8 @@ type lruCache struct {
configIndex map[ConfigHash]sets.Set
typesIndex map[kind.Kind]sets.Set

// mark whether a key is evicted passively
evicted bool
// mark whether a key is evicted on Clear call, passively.
evictedOnClear bool
}

var _ XdsCache = &lruCache{}
Expand Down Expand Up @@ -185,19 +188,22 @@ func (l *lruCache) recordDependentConfigSize() {
}

// This is the callback passed to LRU, it will be called whenever a key is removed.
func (l *lruCache) evict(k interface{}, v interface{}) {
func (l *lruCache) onEvict(k interface{}, v interface{}) {
if features.EnableXDSCacheMetrics {
xdsCacheEvictions.Increment()
if l.evictedOnClear {
xdsCacheEvictsionsOnClear.Increment()
} else {
xdsCacheEvictsionsOnSize.Increment()
}
}

if !l.evicted {
if l.evictedOnClear {
return
}

// We don't need to acquire locks, since this function is called when we write to the store.
key := k.(string)
value := v.(cacheValue)

// we don't need to acquire locks, since this function is called when we write to the store
l.clearConfigIndex(key, value.dependentConfigs)
l.clearTypesIndex(key, value.dependentTypes)
}
Expand Down Expand Up @@ -341,9 +347,9 @@ func (l *lruCache) Clear(configs map[ConfigKey]struct{}) {
defer l.mu.Unlock()
l.token = CacheToken(time.Now().UnixNano())
// not to call evict on keys that are removed actively
l.evicted = false
l.evictedOnClear = true
defer func() {
l.evicted = true
l.evictedOnClear = false
}()
for ckey := range configs {
referenced := l.configIndex[ckey.HashCode()]
Expand All @@ -367,7 +373,7 @@ func (l *lruCache) ClearAll() {
// Purge with an evict function would turn up to be pretty slow since
// it runs the function for every key in the store, might be better to just
// create a new store.
l.store = newLru(l.evict)
l.store = newLru(l.onEvict)
l.configIndex = map[ConfigHash]sets.Set{}
l.typesIndex = map[kind.Kind]sets.Set{}
size(l.store.Len())
Expand Down