diff --git a/.golangci.yml b/.golangci.yml index f5f520a0735..174298d3994 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -66,6 +66,7 @@ linters-settings: - github.com/egirna/icap-client - github.com/unrolled/secure - github.com/go-micro/plugins/v4/store/nats-js-kv + - go-micro.dev/v4 interfacebloat: max: 15 diff --git a/changelog/unreleased/registry-cache-fixes.md b/changelog/unreleased/registry-cache-fixes.md new file mode 100644 index 00000000000..b3074502077 --- /dev/null +++ b/changelog/unreleased/registry-cache-fixes.md @@ -0,0 +1,5 @@ +Bugfix: Micro registry cache fixes + +We now invalidate cache entries when any of the nodes was not updated. + +https://github.com/owncloud/ocis/pull/10429 diff --git a/go.mod b/go.mod index 59d11b0d436..a66ecc475d9 100644 --- a/go.mod +++ b/go.mod @@ -350,6 +350,8 @@ replace github.com/unrolled/secure => github.com/DeepDiver1975/secure v0.0.0-202 replace github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20240807130109-f62bb67e8c90 +replace go-micro.dev/v4 => github.com/butonic/go-micro/v4 v4.11.1-0.20241028133844-ac2cdce96c71 + // exclude the v2 line of go-sqlite3 which was released accidentally and prevents pulling in newer versions of go-sqlite3 // see https://github.com/mattn/go-sqlite3/issues/965 for more details exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible diff --git a/go.sum b/go.sum index 5258211bb18..d1dd9aef7be 100644 --- a/go.sum +++ b/go.sum @@ -194,6 +194,8 @@ github.com/bombsimon/logrusr/v3 v3.1.0/go.mod h1:PksPPgSFEL2I52pla2glgCyyd2OqOHA github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= +github.com/butonic/go-micro/v4 v4.11.1-0.20241028133844-ac2cdce96c71 h1:O26NWIQEs6vT4j/mQBH81D82ix7NE2ks1lekZ+g+C2k= +github.com/butonic/go-micro/v4 v4.11.1-0.20241028133844-ac2cdce96c71/go.mod h1:eE/tD53n3KbVrzrWxKLxdkGw45Fg1qaNLWjpJMvIUF4= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 h1:3uZCA/BLTIu+DqCfguByNMJa2HVHpXvjfy0Dy7g6fuA= github.com/bytecodealliance/wasmtime-go/v3 v3.0.2/go.mod h1:RnUjnIXxEJcL6BgCvNyzCCRzZcxCgsZCi+RNlvYor5Q= @@ -253,8 +255,6 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c= github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME= github.com/cs3org/go-cs3apis v0.0.0-20240724121416-062c4e3046cb h1:KmYZDReplv/yfwc1LNYpDcVhVujC3Pasv6WjXx1haSU= github.com/cs3org/go-cs3apis v0.0.0-20240724121416-062c4e3046cb/go.mod h1:yyP8PRo0EZou3nSH7H4qjlzQwaydPeIRNgX50npQHpE= -github.com/cs3org/reva/v2 v2.25.1-0.20241018153308-a9a7270b8657 h1:AiW6J0bWKpsIL8DjdpF67vkzFY9c/tjp211b6EIEbQ4= -github.com/cs3org/reva/v2 v2.25.1-0.20241018153308-a9a7270b8657/go.mod h1:b+AwpMCeJo7pihdjr0ZBvs7gvgbVNCzFpCOIHqS2hiY= github.com/cs3org/reva/v2 v2.26.0 h1:FTM0L0eP9MOfnEgmU9R+fAjCstgk0dCDbDMm9xg2FA4= github.com/cs3org/reva/v2 v2.26.0/go.mod h1:b+AwpMCeJo7pihdjr0ZBvs7gvgbVNCzFpCOIHqS2hiY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= @@ -1157,8 +1157,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go-micro.dev/v4 v4.11.0 h1:DZ2xcr0pnZJDlp6MJiCLhw4tXRxLw9xrJlPT91kubr0= -go-micro.dev/v4 v4.11.0/go.mod h1:eE/tD53n3KbVrzrWxKLxdkGw45Fg1qaNLWjpJMvIUF4= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= diff --git a/vendor/go-micro.dev/v4/registry/cache/cache.go b/vendor/go-micro.dev/v4/registry/cache/cache.go index 5cbd051e2ea..7990b5a8866 100644 --- a/vendor/go-micro.dev/v4/registry/cache/cache.go +++ b/vendor/go-micro.dev/v4/registry/cache/cache.go @@ -42,6 +42,7 @@ type cache struct { sg singleflight.Group cache map[string][]*registry.Service ttls map[string]time.Time + nttls map[string]map[string]time.Time // node ttls watched map[string]bool // used to stop the cache @@ -94,6 +95,17 @@ func (c *cache) isValid(services []*registry.Service, ttl time.Time) bool { return false } + // a node did not get updated + for _, s := range services { + for _, n := range s.Nodes { + nttl := c.nttls[s.Name][n.Id] + if time.Since(nttl) > 0 { + delete(c.nttls, s.Name) + return false + } + } + } + // ok return true } @@ -115,6 +127,7 @@ func (c *cache) del(service string) { // otherwise delete entries delete(c.cache, service) delete(c.ttls, service) + delete(c.nttls, service) } func (c *cache) get(service string) ([]*registry.Service, error) { @@ -128,7 +141,7 @@ func (c *cache) get(service string) ([]*registry.Service, error) { // make a copy cp := util.Copy(services) - // got services && within ttl so return cache + // got services, nodes && within ttl so return cache if c.isValid(cp, ttl) { c.RUnlock() // return services @@ -161,11 +174,12 @@ func (c *cache) get(service string) ([]*registry.Service, error) { } // cache results + cp := util.Copy(services) c.Lock() - c.set(service, util.Copy(services)) + c.set(service, services) c.Unlock() - return services, nil + return cp, nil } // watch service if not watched @@ -196,6 +210,14 @@ func (c *cache) get(service string) ([]*registry.Service, error) { func (c *cache) set(service string, services []*registry.Service) { c.cache[service] = services c.ttls[service] = time.Now().Add(c.opts.TTL) + for _, s := range services { + for _, n := range s.Nodes { + if c.nttls[s.Name] == nil { + c.nttls[s.Name] = make(map[string]time.Time) + } + c.nttls[s.Name][n.Id] = time.Now().Add(c.opts.TTL) + } + } } func (c *cache) update(res *registry.Result) { @@ -482,6 +504,7 @@ func New(r registry.Registry, opts ...Option) Cache { watchedRunning: make(map[string]bool), cache: make(map[string][]*registry.Service), ttls: make(map[string]time.Time), + nttls: make(map[string]map[string]time.Time), exit: make(chan bool), } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 1ce7168030f..de97ec7af29 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1891,7 +1891,7 @@ github.com/xrash/smetrics # github.com/yashtewari/glob-intersection v0.2.0 ## explicit; go 1.17 github.com/yashtewari/glob-intersection -# go-micro.dev/v4 v4.11.0 +# go-micro.dev/v4 v4.11.0 => github.com/butonic/go-micro/v4 v4.11.1-0.20241028133844-ac2cdce96c71 ## explicit; go 1.18 go-micro.dev/v4 go-micro.dev/v4/api @@ -2406,6 +2406,7 @@ sigs.k8s.io/yaml/goyaml.v2 ## explicit; go 1.13 stash.kopano.io/kgol/rndm # github.com/studio-b12/gowebdav => github.com/aduffeck/gowebdav v0.0.0-20231215102054-212d4a4374f6 +# go-micro.dev/v4 => github.com/butonic/go-micro/v4 v4.11.1-0.20241028133844-ac2cdce96c71 # github.com/egirna/icap-client => github.com/fschade/icap-client v0.0.0-20240802074440-aade4a234387 # github.com/unrolled/secure => github.com/DeepDiver1975/secure v0.0.0-20240611112133-abc838fb797c # github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20240807130109-f62bb67e8c90