mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-02 10:21:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9647 from 2403905/issue-9642

Browse Source 
Fixed the channel lock in a workers pool
This commit is contained in:
Roman Perekhod
2024-07-18 21:17:44 +02:00
committed by GitHub
parent da2e202b21 7f9e018c7c
commit ffe1542205
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/fix-workers-lock.md Normal file
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

4
services/graph/pkg/service/v0/utils.go
View File

@@ -145,7 +145,6 @@ func cs3ReceivedSharesToDriveItems(ctx context.Context,
identityCache identity.IdentityCache,
receivedShares []*collaboration.ReceivedShare) ([]libregraph.DriveItem, error) {
ch := make(chan libregraph.DriveItem)
group := new(errgroup.Group)
// Set max concurrency
group.SetLimit(10)
@@ -160,6 +159,7 @@ func cs3ReceivedSharesToDriveItems(ctx context.Context,
receivedSharesByResourceID[rIDStr] = append(receivedSharesByResourceID[rIDStr], receivedShare)
}
ch := make(chan libregraph.DriveItem, len(receivedSharesByResourceID))
for _, receivedSharesForResource := range receivedSharesByResourceID {
receivedShares := receivedSharesForResource
@@ -477,7 +477,6 @@ func cs3ReceivedOCMSharesToDriveItems(ctx context.Context,
identityCache identity.IdentityCache,
receivedShares []*ocm.ReceivedShare) ([]libregraph.DriveItem, error) {
ch := make(chan libregraph.DriveItem)
group := new(errgroup.Group)
// Set max concurrency
group.SetLimit(10)
@@ -488,6 +487,7 @@ func cs3ReceivedOCMSharesToDriveItems(ctx context.Context,
receivedSharesByResourceID[rIDStr] = append(receivedSharesByResourceID[rIDStr], receivedShare)
}
ch := make(chan libregraph.DriveItem, len(receivedSharesByResourceID))
for _, receivedSharesForResource := range receivedSharesByResourceID {
receivedShares := receivedSharesForResource