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

Merge pull request #3595 from AkihiroSuda/zfs-20190829

Browse Source 
bump containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
This commit is contained in:
Phil Estes 2019-08-29 08:58:07 -04:00 committed by GitHub
commit 36911af3cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -80,7 +80,7 @@ k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c
sigs.k8s.io/yaml v1.1.0 sigs.k8s.io/yaml v1.1.0
# zfs dependencies # zfs dependencies
github.com/containerd/zfs 31af176f2ae84fe142ef2655bf7bb2aa618b3b1f github.com/containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
github.com/mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb github.com/mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
github.com/google/uuid v1.1.1 github.com/google/uuid v1.1.1

16
vendor/github.com/containerd/zfs/zfs.go generated vendored
View File

@ -298,18 +298,20 @@ func (z *snapshotter) Remove(ctx context.Context, key string) (err error) {
datasetName := filepath.Join(z.dataset.Name, id) datasetName := filepath.Join(z.dataset.Name, id)
if k == snapshots.KindCommitted { if k == snapshots.KindCommitted {
datasetName += "@" + snapshotSuffix snapshotName := datasetName + "@" + snapshotSuffix
snapshot, err := zfs.GetDataset(snapshotName)
if err != nil {
return err
}
if err = destroySnapshot(snapshot); err != nil {
return err
}
} }
dataset, err := zfs.GetDataset(datasetName) dataset, err := zfs.GetDataset(datasetName)
if err != nil { if err != nil {
return err return err
} }
if k == snapshots.KindCommitted { if err = destroy(dataset); err != nil {
err = destroySnapshot(dataset)
} else {
err = destroy(dataset)
}
if err != nil {
return err return err
} }
err = t.Commit() err = t.Commit()