Skip to content

estargz: Build: replace golang.org/x/sync with WaitGroup.Go (go1.25) #2249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktock merged 2 commits into from
Feb 16, 2026
+15 −16
Merged

estargz: Build: replace golang.org/x/sync with WaitGroup.Go (go1.25) #2249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7173f0e
estargz: Build: remove redundant mutex
thaJeztah Feb 15, 2026
801c330
estargz: Build: replace golang.org/x/sync with WaitGroup.Go (go1.25)
thaJeztah Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions estargz/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
"github.com/containerd/stargz-snapshotter/estargz/errorutil"
"github.com/klauspost/compress/zstd"
digest "github.com/opencontainers/go-digest"
"golang.org/x/sync/errgroup"
)

type GzipHelperFunc func(io.Reader) (io.ReadCloser, error)
Expand Down Expand Up @@ -235,15 +234,16 @@ func Build(tarBlob *io.SectionReader, opt ...Option) (_ *Blob, rErr error) {
}
writers := make([]*Writer, len(tarParts))
payloads := make([]*os.File, len(tarParts))
var mu sync.Mutex
var eg errgroup.Group
var wg sync.WaitGroup
errCh := make(chan error, len(tarParts)) // buffered to avoid goroutine leaks
for i, parts := range tarParts {
i, parts := i, parts
// builds verifiable stargz sub-blobs
eg.Go(func() error {
wg.Go(func() {
esgzFile, err := layerFiles.TempFile("", "esgzdata")
if err != nil {
return err
errCh <- err
return
}
sw := NewWriterWithCompressor(esgzFile, opts.compression)
sw.ChunkSize = opts.chunkSize
Expand All @@ -255,18 +255,20 @@ func Build(tarBlob *io.SectionReader, opt ...Option) (_ *Blob, rErr error) {
sw.needsOpenGzEntries[f] = struct{}{}
}
if err := sw.AppendTar(readerFromEntries(parts...)); err != nil {
return err
errCh <- err
return
}
mu.Lock()
writers[i] = sw
payloads[i] = esgzFile
mu.Unlock()
return nil
})
}
if err := eg.Wait(); err != nil {
rErr = err
return nil, err
wg.Wait()
close(errCh)

for err := range errCh {
if err != nil {
return nil, err
}
}
tocAndFooter, tocDgst, err := closeWithCombine(writers...)
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions estargz/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
module github.com/containerd/stargz-snapshotter/estargz

go 1.24.0
go 1.25.0

require (
github.com/klauspost/compress v1.18.3
github.com/opencontainers/go-digest v1.0.0
github.com/vbatts/tar-split v0.12.2
golang.org/x/sync v0.19.0
)
2 changes: 0 additions & 2 deletions estargz/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/vbatts/tar-split v0.12.2 h1:w/Y6tjxpeiFMR47yzZPlPj/FcPLpXbTUi/9H7d3CPa4=
github.com/vbatts/tar-split v0.12.2/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
Loading