primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 08:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

copy context before starting stash operations to prevent ctx cancellations (#1790)

Browse Source 
* copy context before starting stash operations to prevent ctx cancellations

* add comment about context cancellation
This commit is contained in:
Ashish Ranjan
2022-09-15 23:03:59 +08:00
committed by GitHub
parent e97cb5f5df
commit 33777c5cc4
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/download/protocol.go
+14
View File
@@ -5,11 +5,14 @@ import (
"regexp"
"strings"
"sync"
"time"
"github.com/gomods/athens/pkg/download/mode"
"github.com/gomods/athens/pkg/errors"
"github.com/gomods/athens/pkg/log"
"github.com/gomods/athens/pkg/module"
"github.com/gomods/athens/pkg/observ"
"github.com/gomods/athens/pkg/requestid"
"github.com/gomods/athens/pkg/stash"
"github.com/gomods/athens/pkg/storage"
)
@@ -248,6 +251,10 @@ func (p *protocol) Zip(ctx context.Context, mod, ver string) (storage.SizeReadCl
func (p *protocol) processDownload(ctx context.Context, mod, ver string, f func(newVer string) error) error {
const op errors.Op = "protocol.processDownload"
// Create a new context with custom deadline and ditch whatever deadline was passed by the caller.
// This is needed so that the async go routines can continue even after the HTTP request is complete (which leads to context cancellation).
ctx, cancel := copyContextWithCustomTimeout(ctx, time.Minute*15)
defer cancel()
switch p.df.Match(mod) {
case mode.Sync:
newVer, err := p.stasher.Stash(ctx, mod, ver)
@@ -288,3 +295,10 @@ func union(list1, list2 []string) []string {
}
return unique
}
func copyContextWithCustomTimeout(ctx context.Context, timeout time.Duration) (context.Context, context.CancelFunc) {
ctxCopy, cancel := context.WithTimeout(context.Background(), timeout)
requestid.SetInContext(ctxCopy, requestid.FromContext(ctx))
log.SetEntryInContext(ctxCopy, log.EntryFromContext(ctx))
return ctxCopy, cancel
}