kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1308 from aluzzardi/semi-atomic-vendoring

Browse Source 
semi-atomic vendoring to improve concurrency
This commit is contained in:
Sam Alba 2021-12-23 11:35:13 -08:00 committed by GitHub
commit f0225274c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
state/project.go
View File

@ -428,12 +428,38 @@ func VendorUniverse(ctx context.Context, p string) error {
} }
log.Ctx(ctx).Debug().Str("mod", p).Msg("vendoring universe") log.Ctx(ctx).Debug().Str("mod", p).Msg("vendoring universe")
if err := stdlib.Vendor(ctx, p); err != nil {
// Vendor in a temporary directory
tmp, err := os.MkdirTemp(path.Join(p, "cue.mod", "pkg"), "vendor-*")
if err != nil {
return err
}
if err := stdlib.Vendor(ctx, tmp); err != nil {
// FIXME(samalba): disabled install remote stdlib temporarily // FIXME(samalba): disabled install remote stdlib temporarily
// if _, err := mod.Install(ctx, p, stdlib.ModuleName, ""); err != nil { // if _, err := mod.Install(ctx, p, stdlib.ModuleName, ""); err != nil {
return err return err
} }
// Semi-atomic swap of the vendor directory
// The following basically does:
// rm -rf cue.mod/pkg/MODULE.old
// mv cue.mod/pkg/MODULE cue.mod/pkg/MODULE.old
// mv VENDOR cue.mod/pkg/MODULE
// rm -rf cue.mod/pkg/MODULE.old
newStdlib := path.Join(p, stdlib.Path)
oldStdlib := newStdlib + ".old"
if err := os.RemoveAll(oldStdlib); err != nil && !errors.Is(err, os.ErrNotExist) {
return err
}
if err := os.Rename(newStdlib, oldStdlib); err != nil && !errors.Is(err, os.ErrNotExist) {
return err
}
defer os.RemoveAll(oldStdlib)
if err := os.Rename(tmp, newStdlib); err != nil {
return err
}
return nil return nil
} }

9
stdlib/stdlib.go
View File

@ -20,12 +20,7 @@ var (
Path = path.Join("cue.mod", "pkg", ModuleName) Path = path.Join("cue.mod", "pkg", ModuleName)
) )
func Vendor(ctx context.Context, mod string) error { func Vendor(ctx context.Context, dest string) error {
// Remove any existing copy of the universe
if err := os.RemoveAll(path.Join(mod, Path)); err != nil {
return err
}
// Write the current version // Write the current version
return fs.WalkDir(FS, ".", func(p string, entry fs.DirEntry, err error) error { return fs.WalkDir(FS, ".", func(p string, entry fs.DirEntry, err error) error {
if err != nil { if err != nil {
@ -45,7 +40,7 @@ func Vendor(ctx context.Context, mod string) error {
return fmt.Errorf("%s: %w", p, err) return fmt.Errorf("%s: %w", p, err)
} }
overlayPath := path.Join(mod, Path, p) overlayPath := path.Join(dest, p)
if err := os.MkdirAll(filepath.Dir(overlayPath), 0755); err != nil { if err := os.MkdirAll(filepath.Dir(overlayPath), 0755); err != nil {
return err return err