The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/4263
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Closes #4188
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 31b98d61feca19097c1738caad059d6d8eb8e819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Tue, 20 Feb 2018 01:47:18 -0500
Subject: [PATCH] zfs: Don't fail on missing image snapshot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #4188
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
lxd/storage_zfs.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lxd/storage_zfs.go b/lxd/storage_zfs.go
index 30a616b93..b0bfb1e2b 100644
--- a/lxd/storage_zfs.go
+++ b/lxd/storage_zfs.go
@@ -1948,7 +1948,7 @@ func (s *storageZfs) ImageDelete(fingerprint string)
error {
if zfsFilesystemEntityExists(poolName, fs) {
removable, err := zfsPoolVolumeSnapshotRemovable(poolName, fs,
"readonly")
- if err != nil {
+ if err != nil && zfsFilesystemEntityExists(poolName,
fmt.Sprintf("%s@readonly", fs)) {
return err
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
