sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the channel lock in a workers pool

Browse Source
This commit is contained in:
Roman Perekhod
2024-07-18 15:33:50 +02:00
parent 2985823dd5
commit 7f9e018c7c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog/unreleased/fix-workers-lock.md
+6
View File
@@ -0,0 +1,6 @@
Bugfix: Fixed the channel lock in a workers pool
We fixed an error when the users can't see more than 10 shares
https://github.com/owncloud/ocis/pull/9647
https://github.com/owncloud/ocis/issues/9642
services/graph/pkg/service/v0/utils.go
+2 -2
View File
@@ -145,7 +145,6 @@ func cs3ReceivedSharesToDriveItems(ctx context.Context,
identityCache identity.IdentityCache, identityCache identity.IdentityCache,
receivedShares []*collaboration.ReceivedShare) ([]libregraph.DriveItem, error) { receivedShares []*collaboration.ReceivedShare) ([]libregraph.DriveItem, error) {
ch := make(chan libregraph.DriveItem)
group := new(errgroup.Group) group := new(errgroup.Group)
// Set max concurrency // Set max concurrency
group.SetLimit(10) group.SetLimit(10)
@@ -160,6 +159,7 @@ func cs3ReceivedSharesToDriveItems(ctx context.Context,
receivedSharesByResourceID[rIDStr] = append(receivedSharesByResourceID[rIDStr], receivedShare) receivedSharesByResourceID[rIDStr] = append(receivedSharesByResourceID[rIDStr], receivedShare)
} }
ch := make(chan libregraph.DriveItem, len(receivedSharesByResourceID))
for _, receivedSharesForResource := range receivedSharesByResourceID { for _, receivedSharesForResource := range receivedSharesByResourceID {
receivedShares := receivedSharesForResource receivedShares := receivedSharesForResource
@@ -477,7 +477,6 @@ func cs3ReceivedOCMSharesToDriveItems(ctx context.Context,
identityCache identity.IdentityCache, identityCache identity.IdentityCache,
receivedShares []*ocm.ReceivedShare) ([]libregraph.DriveItem, error) { receivedShares []*ocm.ReceivedShare) ([]libregraph.DriveItem, error) {
ch := make(chan libregraph.DriveItem)
group := new(errgroup.Group) group := new(errgroup.Group)
// Set max concurrency // Set max concurrency
group.SetLimit(10) group.SetLimit(10)
@@ -488,6 +487,7 @@ func cs3ReceivedOCMSharesToDriveItems(ctx context.Context,
receivedSharesByResourceID[rIDStr] = append(receivedSharesByResourceID[rIDStr], receivedShare) receivedSharesByResourceID[rIDStr] = append(receivedSharesByResourceID[rIDStr], receivedShare)
} }
ch := make(chan libregraph.DriveItem, len(receivedSharesByResourceID))
for _, receivedSharesForResource := range receivedSharesByResourceID { for _, receivedSharesForResource := range receivedSharesByResourceID {
receivedShares := receivedSharesForResource receivedShares := receivedSharesForResource