diff options
| author | Taras Madan <tarasmadan@google.com> | 2024-12-19 21:05:23 +0100 |
|---|---|---|
| committer | Taras Madan <tarasmadan@google.com> | 2024-12-19 21:57:15 +0000 |
| commit | 0f61b4150f69bfee656d0398f8b4125a66a9512f (patch) | |
| tree | 7cb40b53201338818416db3ff00d49c0aa6268f3 /pkg/cover | |
| parent | b8e81ee07dfe7221f7d4a54bb2a294ab84bed5f1 (diff) | |
pkg/covermerger: propagate context cancellation
The problem is the deadlock happening on GCS storage error.
GCS client establishes the connection when it has enough data to write.
It is approximately 16M. The error happens on io.Writer access in the middle of the merge.
This error terminates errgroup goroutine. Other goroutines remain blocked.
This commit propagates termination signal to other goroutines.
Diffstat (limited to 'pkg/cover')
| -rw-r--r-- | pkg/cover/file.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/cover/file.go b/pkg/cover/file.go index 2939935b9..a0561dfe7 100644 --- a/pkg/cover/file.go +++ b/pkg/cover/file.go @@ -79,7 +79,7 @@ func GetMergeResult(c context.Context, ns, repo, forCommit, sourceCommit, filePa } ch := make(chan *covermerger.FileMergeResult, 1) - if err := covermerger.MergeCSVData(config, csvReader, ch); err != nil { + if err := covermerger.MergeCSVData(c, config, csvReader, ch); err != nil { return nil, fmt.Errorf("error merging coverage: %w", err) } |