fix statcache logic (#2440)

Signed-off-by: jkoberg <jkoberg@owncloud.com>
cs3org · Feb 14, 2022 · c739713 · c739713
1 parent 1ed9c9f
commit c739713
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/changelog/unreleased/improve_statcache.md b/changelog/unreleased/improve_statcache.md
@@ -0,0 +1,5 @@
+Bugfix: Add ArbitraryMetadataKeys to statcache key
+
+Otherwise stating with and without them would return the same result (because it is cached)
+
+https://github.com/cs3org/reva/pull/2440
diff --git a/internal/grpc/services/gateway/storageprovidercache.go b/internal/grpc/services/gateway/storageprovidercache.go
@@ -211,19 +211,24 @@ type cachedAPIClient struct {
 // generates a user specific key pointing to ref - used for statcache
 // a key looks like: uid:1234-1233!sid:5678-5677!oid:9923-9934!path:/path/to/source
 // as you see it adds "uid:"/"sid:"/"oid:" prefixes to the uuids so they can be differentiated
-func statKey(user *userpb.User, ref *provider.Reference) string {
+func statKey(user *userpb.User, ref *provider.Reference, metaDataKeys []string) string {
 	if ref == nil || ref.ResourceId == nil || ref.ResourceId.StorageId == "" {
 		return ""
 	}
 
-	return "uid" + user.Id.OpaqueId + "!sid:" + ref.ResourceId.StorageId + "!oid:" + ref.ResourceId.OpaqueId + "!path:" + ref.Path
+	key := "uid" + user.Id.OpaqueId + "!sid:" + ref.ResourceId.StorageId + "!oid:" + ref.ResourceId.OpaqueId + "!path:" + ref.Path
+	for _, k := range metaDataKeys {
+		key += "!mdk:" + k
+	}
+
+	return key
 }
 
 // Stat looks in cache first before forwarding to storage provider
 func (c *cachedAPIClient) Stat(ctx context.Context, in *provider.StatRequest, opts ...grpc.CallOption) (*provider.StatResponse, error) {
 	cache := c.caches[stat]
 
-	key := statKey(ctxpkg.ContextMustGetUser(ctx), in.Ref)
+	key := statKey(ctxpkg.ContextMustGetUser(ctx), in.Ref, in.ArbitraryMetadataKeys)
 	if key != "" {
 		s := &provider.StatResponse{}
 		if err := pullFromCache(cache, key, s); err == nil {