fix registry caching

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
cs3org · Jan 10, 2022 · 84eba76 · 84eba76
1 parent c05e074
commit 84eba76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/changelog/unreleased/fix-registry-caching.md b/changelog/unreleased/fix-registry-caching.md
@@ -0,0 +1,5 @@
+Bugfix: fix registry caching
+
+We now cache space lookups per user.
+
+https://github.com/cs3org/reva/pull/2427
diff --git a/internal/grpc/services/gateway/storageprovidercache.go b/internal/grpc/services/gateway/storageprovidercache.go
@@ -164,7 +164,11 @@ type cachedRegistryClient struct {
 func (c *cachedRegistryClient) ListStorageProviders(ctx context.Context, in *registry.ListStorageProvidersRequest, opts ...grpc.CallOption) (*registry.ListStorageProvidersResponse, error) {
 	cache := c.caches[listproviders]
 
-	key := sdk.DecodeOpaqueMap(in.Opaque)["storage_id"]
+	user := ctxpkg.ContextMustGetUser(ctx)
+
+	storageID := sdk.DecodeOpaqueMap(in.Opaque)["storage_id"]
+
+	key := user.GetId().GetOpaqueId() + storageID
 	if key != "" {
 		s := &registry.ListStorageProvidersResponse{}
 		if err := pullFromCache(cache, key, s); err == nil {
@@ -176,9 +180,9 @@ func (c *cachedRegistryClient) ListStorageProviders(ctx context.Context, in *reg
 	switch {
 	case err != nil:
 		return nil, err
-	case resp.Status.Code != rpc.Code_CODE_OK && resp.Status.Code != rpc.Code_CODE_NOT_FOUND:
+	case resp.Status.Code != rpc.Code_CODE_OK:
 		return resp, nil
-	case key == "":
+	case storageID == "":
 		return resp, nil
 	default:
 		return resp, pushToCache(cache, key, resp)