gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move cas in prunePubPermsCache() itself and clear with atomic.Store

Browse Source 
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
This commit is contained in:
Ivan Kozlovic
2021-04-20 21:10:46 -06:00
parent 1014041be3
commit 32f1a58b09
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/client.go
View File

@@ -3270,6 +3270,12 @@ func (c *client) pruneDenyCache() {
// prunePubPermsCache will prune the cache via randomly
// deleting items. Doing so pruneSize items at a time.
func (c *client) prunePubPermsCache() {
// There is a case where we can invoke this from multiple go routines,
// (in deliverMsg() if sub.client is a LEAF), so we make sure to prune
// from only one go routine at a time.
if !atomic.CompareAndSwapInt32(&c.perms.prun, 0, 1) {
return
}
const maxPruneAtOnce = 1000
r := 0
c.perms.pcache.Range(func(k, _ interface{}) bool {
@@ -3281,7 +3287,7 @@ func (c *client) prunePubPermsCache() {
return true
})
atomic.AddInt32(&c.perms.pcsz, -int32(r))
atomic.CompareAndSwapInt32(&c.perms.prun, 1, 0)
atomic.StoreInt32(&c.perms.prun, 0)
}
// pubAllowed checks on publish permissioning.
@@ -3340,11 +3346,7 @@ func (c *client) pubAllowedFullCheck(subject string, fullCheck, hasLock bool) bo
} else {
// Update our cache here.
c.perms.pcache.Store(string(subject), allowed)
// There is a case where we can invoke this from multiple go routines,
// (in deliverMsg() if sub.client is a LEAF), so we make sure to prune
// from only one go routine at a time.
if n := atomic.AddInt32(&c.perms.pcsz, 1); n > maxPermCacheSize &&
atomic.CompareAndSwapInt32(&c.perms.prun, 0, 1) {
if n := atomic.AddInt32(&c.perms.pcsz, 1); n > maxPermCacheSize {
c.prunePubPermsCache()
}
}