[WIP] Performance tuning #3932

butonic · 2023-06-05T08:58:13Z

This is work in progress where we document some performance tweaks we made when running on a large scale deployment. We will extract individual PRs from this to make reviewing easier.

jsoncs3 concurrency concurrently invalidate mtime cache in jsoncs3 share manager #3933
sharesstorageprovider stat cache add stat cache to sharesstorageprovider #3940
reuse connections properly, requires upstream fixes enhancement: introduce micro registry and client pool selectors #3939
drop locks in jsoncs3 [wip] Jsoncs3 investigate #3935
add tracing in various places
helm file changes: add settings cache store owncloud/ocis-charts#299

replace the prepared service registry with a go micro service registry

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

hound · 2023-06-05T09:01:29Z

internal/grpc/interceptors/auth/auth.go

@@ -300,13 +300,18 @@
 	return u, tokenScope, nil
 }

-func getUserGroups(ctx context.Context, u *userpb.User, client gatewayv1beta1.GatewayAPIClient) ([]string, error) {
+func getUserGroups(ctx context.Context, u *userpb.User, selector pool.Selectable[gateway.GatewayAPIClient]) ([]string, error) {


missing ',' in parameter list

hound · 2023-06-05T09:01:29Z

internal/grpc/interceptors/auth/scope.go

@@ -124,13 +128,18 @@ func expandAndVerifyScope(ctx context.Context, req interface{}, tokenScope map[s
 	return errtypes.PermissionDenied(fmt.Sprintf("access to resource %+v not allowed within the assigned scope", req))
 }

-func resolveLightweightScope(ctx context.Context, ref *provider.Reference, scope *authpb.Scope, user *userpb.User, client gateway.GatewayAPIClient, mgr token.Manager) error {
+func resolveLightweightScope(ctx context.Context, ref *provider.Reference, scope *authpb.Scope, user *userpb.User, selector pool.Selectable[gateway.GatewayAPIClient], mgr token.Manager) error {


missing ',' in parameter list (and 10 more errors)

hound · 2023-06-05T09:01:29Z

internal/grpc/services/gateway/gateway.go

@@ -163,6 +166,8 @@
 	providerCache            cache.ProviderCache
 	createHomeCache          cache.CreateHomeCache
 	createPersonalSpaceCache cache.CreatePersonalSpaceCache
+	authRegistrySelector     pool.Selectable[auth.RegistryAPIClient]


expected ';', found '[' (and 2 more errors)

hound · 2023-06-05T09:01:29Z

internal/grpc/services/publicstorageprovider/publicstorageprovider.go

 	"strings"

 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
 	userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"


expected ';', found '[' (and 10 more errors)

hound · 2023-06-05T09:01:31Z

internal/grpc/services/sharesstorageprovider/options.go

+
+// Options represent options
+type Options struct {
+	GatewaySelector       pool.Selectable[gateway.GatewayAPIClient]


expected ';', found '[' (and 2 more errors)

hound · 2023-06-05T09:01:32Z

internal/http/services/owncloud/ocdav/propfind/propfind.go

 // Handler handles propfind requests
 type Handler struct {
 	PublicURL string
-	getClient GetGatewayServiceClientFunc
+	selector  pool.Selectable[gateway.GatewayAPIClient]


expected ';', found '[' (and 10 more errors)

hound · 2023-06-05T09:01:32Z

internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go

@@ -37,8 +38,8 @@ import (
 // LookupReferenceForPath returns:
 // a reference with root and relative path
 // the status and error for the lookup
-func LookupReferenceForPath(ctx context.Context, client gateway.GatewayAPIClient, path string) (*storageProvider.Reference, *rpc.Status, error) {
-	space, cs3Status, err := LookUpStorageSpaceForPath(ctx, client, path)
+func LookupReferenceForPath(ctx context.Context, selector pool.Selectable[gateway.GatewayAPIClient], path string) (*storageProvider.Reference, *rpc.Status, error) {


missing ',' in parameter list (and 1 more errors)

hound · 2023-06-05T09:01:32Z

internal/http/services/owncloud/ocdav/tpc.go

@@ -161,7 +168,7 @@ func (s *svc) handleTPCPull(ctx context.Context, w http.ResponseWriter, r *http.
 	fmt.Fprintf(w, "success: Created")
 }

-func (s *svc) performHTTPPull(ctx context.Context, client gateway.GatewayAPIClient, r *http.Request, w http.ResponseWriter, ns string) error {
+func (s *svc) performHTTPPull(ctx context.Context, selector pool.Selectable[gateway.GatewayAPIClient], r *http.Request, w http.ResponseWriter, ns string) error {


missing ',' in parameter list

hound · 2023-06-05T09:01:33Z

pkg/registry/registry.go


-	// ID returns the node ID.
-	ID() string
+func GetRegistry() mRegistry.Registry {


exported function GetRegistry should have comment or be unexported

hound · 2023-06-05T09:01:33Z

pkg/storage/utils/metadata/cs3.go

 // CS3 represents a metadata storage with a cs3 storage backend
 type CS3 struct {
-	providerAddr      string
-	gatewayAddr       string
+	providerSelector  pool.Selectable[provider.ProviderAPIClient]


expected ';', found '[' (and 5 more errors)

hound · 2023-06-05T09:01:36Z

pkg/utils/grpc.go

 	"google.golang.org/grpc/metadata"
 )

 // Impersonate returns an authenticated reva context and the user it represents
-func Impersonate(userID *user.UserId, gwc gateway.GatewayAPIClient, machineAuthAPIKey string) (context.Context, *user.User, error) {
-	usr, err := GetUser(userID, gwc, machineAuthAPIKey)
+func Impersonate(userID *user.UserId, selector pool.Selectable[gateway.GatewayAPIClient], machineAuthAPIKey string) (context.Context, *user.User, error) {


missing ',' in parameter list (and 2 more errors)

hound · 2023-06-05T09:01:37Z

pkg/micro/ocdav/option.go

@@ -45,7 +46,7 @@ type Options struct {
 	JWTSecret string

 	FavoriteManager favorite.Manager
-	GatewayClient   gateway.GatewayAPIClient
+	GatewaySelector pool.Selectable[gateway.GatewayAPIClient]


expected ';', found '[' (and 2 more errors)

hound · 2023-06-05T09:01:37Z

pkg/publicshare/manager/cs3/cs3.go

@@ -58,7 +58,7 @@ func init() {

 // Manager implements a publicshare manager using a cs3 storage backend
 type Manager struct {
-	gatewayClient gateway.GatewayAPIClient
+	gatewaySelector pool.Selectable[gateway.GatewayAPIClient]


expected ';', found '[' (and 7 more errors)

hound · 2023-06-05T09:01:37Z

pkg/rgrpc/todo/pool/selector.go

+	"google.golang.org/grpc"
+)
+
+type Selectable[T any] interface {


expected ']', found any (and 4 more errors)

hound · 2023-06-05T09:01:38Z

pkg/share/manager/jsoncs3/jsoncs3.go

@@ -145,8 +149,8 @@ type Manager struct {

 	initialized bool

-	gateway     gatewayv1beta1.GatewayAPIClient
-	eventStream events.Stream
+	gatewaySelector pool.Selectable[gatewayv1beta1.GatewayAPIClient]


expected ';', found '[' (and 10 more errors)

hound · 2023-06-05T09:01:38Z

pkg/storage/utils/decomposedfs/spacepermissions.go

-	item  PermissionsChecker   // handles item permissions
-	space CS3PermissionsClient // handlers space permissions
+	item  PermissionsChecker                                   // handles item permissions
+	space pool.Selectable[cs3permissions.PermissionsAPIClient] // handlers space permissions


expected ';', found '[' (and 2 more errors)

hound · 2023-06-05T09:01:38Z

pkg/storage/utils/downloader/downloader.go

@@ -39,14 +40,14 @@ type Downloader interface {
 }

 type revaDownloader struct {
-	gtw        gateway.GatewayAPIClient
+	selector   pool.Selectable[gateway.GatewayAPIClient]


expected ';', found '[' (and 2 more errors)

hound · 2023-06-05T09:01:38Z

pkg/storage/utils/walker/walker.go

@@ -46,12 +47,12 @@ type Walker interface {
 }

 type revaWalker struct {
-	gtw gateway.GatewayAPIClient
+	selector pool.Selectable[gateway.GatewayAPIClient]


expected ';', found '[' (and 2 more errors)

fschade and others added 18 commits May 28, 2023 15:27

enhancement: go micro service registry

da195f5

replace the prepared service registry with a go micro service registry

enhancement: get rid of active service registration

2696626

enhancement: add selector pattern to the client pool

fa216b4

enhancement: support for pool selector options

c600c92

use selector

087da6c

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

add registry option

b81813d

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

defer selector initialization in jsoncs3

0289703

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

add error details

f3b3766

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

update ge.mod

f3e1936

reenable ip addresses in selector again

e0dedc5

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

tidy

edbdd20

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

enhancement: fascade use of selectors in clients

a8346c8

use selector in more places

95ff17e

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

add statcache to sharesstorageprovider, use selectors

bc0b4ad

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

update otel semconv

7872fbe

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

skip discovering services by address, just use address

c3dd573

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

trace jsoncs3 caches

9ecbfcb

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

trace jsoncs3 share manager, drop locks, add concurrent workers

9fa3d4f

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

hound bot reviewed Jun 5, 2023

View reviewed changes

butonic changed the title ~~[WIP] Performance tunig~~ [WIP] Performance tuning Jun 5, 2023

butonic mentioned this pull request Jun 5, 2023

[WIP] Performance tunig owncloud/ocis#6443

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Performance tuning #3932

[WIP] Performance tuning #3932

butonic commented Jun 5, 2023 •

edited

Loading

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

hound bot Jun 5, 2023

[WIP] Performance tuning #3932

Are you sure you want to change the base?

[WIP] Performance tuning #3932

Conversation

butonic commented Jun 5, 2023 • edited Loading

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

hound bot Jun 5, 2023

Choose a reason for hiding this comment

butonic commented Jun 5, 2023 •

edited

Loading