Merge branch 'edge' into jsoncs3

cs3org · Aug 22, 2022 · 5b7a094 · 5b7a094
2 parents b41b20f + 15d0666
commit 5b7a094
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/changelog/unreleased/disable-cache.md b/changelog/unreleased/disable-cache.md
@@ -0,0 +1,6 @@
+Bugfix: Disable caching
+
+We disabled the cache, because there are race condtions that cause tests to fail.
+
+https://github.com/owncloud/ocis/issues/4251
+https://github.com/cs3org/reva/pull/3167
diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go
@@ -1089,7 +1089,8 @@ func (s *svc) getStorageProviderClient(_ context.Context, p *registry.ProviderIn
 		return nil, err
 	}
 
-	return s.cache.StorageProviderClient(c), nil
+	// TODO: reinstate cache as soon there is a implementation for a non-in-memory cache
+	return c, nil
 }
 
 func (s *svc) getStorageRegistryClient(_ context.Context, address string) (registry.RegistryAPIClient, error) {