From a292bf0f248da4d2e2fef062ab24100e317fd383 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 29 Aug 2019 14:28:13 +0900 Subject: [PATCH] bump containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251 https://github.com/containerd/zfs/compare/31af176f2ae84fe142ef2655bf7bb2aa618b3b1f...2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251 Fix containerd/zfs#22 Signed-off-by: Akihiro Suda --- vendor.conf | 2 +- vendor/github.com/containerd/zfs/zfs.go | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/vendor.conf b/vendor.conf index 49b9f71f5..d8063b2a9 100644 --- a/vendor.conf +++ b/vendor.conf @@ -80,7 +80,7 @@ k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c sigs.k8s.io/yaml v1.1.0 # zfs dependencies -github.com/containerd/zfs 31af176f2ae84fe142ef2655bf7bb2aa618b3b1f +github.com/containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251 github.com/mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb github.com/google/uuid v1.1.1 diff --git a/vendor/github.com/containerd/zfs/zfs.go b/vendor/github.com/containerd/zfs/zfs.go index 5b249b970..5a08fda6e 100644 --- a/vendor/github.com/containerd/zfs/zfs.go +++ b/vendor/github.com/containerd/zfs/zfs.go @@ -298,18 +298,20 @@ func (z *snapshotter) Remove(ctx context.Context, key string) (err error) { datasetName := filepath.Join(z.dataset.Name, id) 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) if err != nil { return err } - if k == snapshots.KindCommitted { - err = destroySnapshot(dataset) - } else { - err = destroy(dataset) - } - if err != nil { + if err = destroy(dataset); err != nil { return err } err = t.Commit()