Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-16 07:06:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(GODT-2224): Properly handle context cancellation during sync

Browse Source 
There was an issue where new attachment download requests would hang
forever due to not checking whether the context was cancelled. At this
point there were no more workers to consume to channel messages.
This commit is contained in:
Leander Beernaert
2023-02-01 14:45:03 +01:00
parent 45ec6b6e74
commit fbac5134ca
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/user/sync.go
View File

@ -344,7 +344,7 @@ func syncMessages(
flushUpdateCh := make(chan flushUpdate) flushUpdateCh := make(chan flushUpdate)
errorCh := make(chan error, maxParallelDownloads+2) errorCh := make(chan error, maxParallelDownloads*4)
// Go routine in charge of downloading message metadata // Go routine in charge of downloading message metadata
logging.GoAnnotated(ctx, func(ctx context.Context) { logging.GoAnnotated(ctx, func(ctx context.Context) {
@ -360,13 +360,15 @@ func syncMessages(
metadata, err := client.GetMessageMetadataPage(ctx, 0, len(metadataChunk), proton.MessageFilter{ID: metadataChunk}) metadata, err := client.GetMessageMetadataPage(ctx, 0, len(metadataChunk), proton.MessageFilter{ID: metadataChunk})
if err != nil { if err != nil {
downloadReq.err = err downloadReq.err = err
downloadCh <- downloadReq select {
case downloadCh <- downloadReq:
case <-ctx.Done():
return
}
return return
} }
if ctx.Err() != nil { if ctx.Err() != nil {
downloadReq.err = err
downloadCh <- downloadReq
return return
} }
@ -789,7 +791,11 @@ func (a *attachmentDownloader) getAttachments(ctx context.Context, attachments [
resultChs := make([]chan attachmentResult, len(attachments)) resultChs := make([]chan attachmentResult, len(attachments))
for i, id := range attachments { for i, id := range attachments {
resultChs[i] = make(chan attachmentResult, 1) resultChs[i] = make(chan attachmentResult, 1)
a.workerCh <- attachmentJob{id: id.ID, result: resultChs[i], size: id.Size} select {
case a.workerCh <- attachmentJob{id: id.ID, result: resultChs[i], size: id.Size}:
case <-ctx.Done():
return nil, ctx.Err()
}
} }
result := make([][]byte, len(attachments)) result := make([][]byte, len(attachments))