github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5422 from TBBle/use-layer-deactivate-instead-of-vhd-detach

Browse Source 
Use DeactivateLayer to unlock layers that we cannot rename
This commit is contained in:
Michael Crosby 2021-06-03 11:14:11 -04:00 committed by GitHub
commit bd4fcf6322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
snapshots/windows/windows.go
View File

@ -31,7 +31,6 @@ import (
"github.com/Microsoft/go-winio" "github.com/Microsoft/go-winio"
winfs "github.com/Microsoft/go-winio/pkg/fs" winfs "github.com/Microsoft/go-winio/pkg/fs"
"github.com/Microsoft/go-winio/vhd"
"github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim"
"github.com/Microsoft/hcsshim/computestorage" "github.com/Microsoft/hcsshim/computestorage"
"github.com/Microsoft/hcsshim/pkg/ociwclayer" "github.com/Microsoft/hcsshim/pkg/ociwclayer"
@ -256,11 +255,19 @@ func (s *snapshotter) Remove(ctx context.Context, key string) error {
return err return err
} }
// If permission denied, it's possible that the scratch is still mounted, an // If permission denied, it's possible that the scratch is still mounted, an
// artifact after a hard daemon crash for example. Worth a shot to try detaching it // artifact after a hard daemon crash for example. Worth a shot to try deactivating it
// before retrying the rename. // before retrying the rename.
if detachErr := vhd.DetachVhd(filepath.Join(path, "sandbox.vhdx")); detachErr != nil { var (
return errors.Wrapf(err, "failed to detach VHD: %s", detachErr) home, layerID = filepath.Split(path)
di = hcsshim.DriverInfo{
HomeDir: home,
} }
)
if deactvateErr := hcsshim.DeactivateLayer(di, layerID); deactvateErr != nil {
return errors.Wrapf(err, "failed to deactivate layer following failed rename: %s", deactvateErr)
}
if renameErr := os.Rename(path, renamed); renameErr != nil && !os.IsNotExist(renameErr) { if renameErr := os.Rename(path, renamed); renameErr != nil && !os.IsNotExist(renameErr) {
return errors.Wrapf(err, "second rename attempt following detach failed: %s", renameErr) return errors.Wrapf(err, "second rename attempt following detach failed: %s", renameErr)
} }
@ -461,7 +468,7 @@ func (s *snapshotter) createScratchLayer(ctx context.Context, snDir string, pare
return nil return nil
} }
// convertScratchToReadOnlyLayer reimporst the layer over itself, to transfer the files from the sandbox.vhdx to the on-disk storage. // convertScratchToReadOnlyLayer reimports the layer over itself, to transfer the files from the sandbox.vhdx to the on-disk storage.
func (s *snapshotter) convertScratchToReadOnlyLayer(ctx context.Context, snapshot storage.Snapshot, path string) (retErr error) { func (s *snapshotter) convertScratchToReadOnlyLayer(ctx context.Context, snapshot storage.Snapshot, path string) (retErr error) {
// TODO darrenstahlmsft: When this is done isolated, we should disable these. // TODO darrenstahlmsft: When this is done isolated, we should disable these.