unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 282 Wiki Activity

fix major deadlock in registry cache

Browse Source
This commit is contained in:
Asim Aslam 2019-10-04 16:29:56 +01:00
parent 05eacd74c8
commit c4b6d0f3a8
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
registry/cache/cache.go vendored
View File

@ -100,7 +100,7 @@ func (c *cache) quit() bool {
func (c *cache) del(service string) { func (c *cache) del(service string) {
// don't blow away cache in error state // don't blow away cache in error state
if err := c.getStatus(); err != nil { if err := c.status; err != nil {
return return
} }
// otherwise delete entries // otherwise delete entries
@ -116,13 +116,14 @@ func (c *cache) get(service string) ([]*registry.Service, error) {
services := c.cache[service] services := c.cache[service]
// get cache ttl // get cache ttl
ttl := c.ttls[service] ttl := c.ttls[service]
// got services && within ttl so return cache
if c.isValid(services, ttl) {
// make a copy // make a copy
cp := registry.Copy(services) cp := registry.Copy(services)
// unlock the read
// unlock the read lock
c.RUnlock() c.RUnlock()
// got services && within ttl so return cache
if c.isValid(cp, ttl) {
// return servics // return servics
return cp, nil return cp, nil
} }
@ -136,8 +137,9 @@ func (c *cache) get(service string) ([]*registry.Service, error) {
if len(cached) > 0 { if len(cached) > 0 {
// set the error status // set the error status
c.setStatus(err) c.setStatus(err)
// return the stale cache // return the stale cache
return registry.Copy(cached), nil return cached, nil
} }
// otherwise return error // otherwise return error
return nil, err return nil, err
@ -161,9 +163,6 @@ func (c *cache) get(service string) ([]*registry.Service, error) {
go c.run(service) go c.run(service)
} }
// unlock the read lock
c.RUnlock()
// get and return services // get and return services
return get(service, services) return get(service, services)
} }