actually delete invalid snapshots

This commit is contained in:
shoopea 2023-06-29 23:25:34 +02:00
parent 3c785dec8b
commit 0e0e5db303
2 changed files with 4 additions and 6 deletions

View File

@ -1,7 +1,7 @@
// Code generated by version.sh (@generated) DO NOT EDIT. // Code generated by version.sh (@generated) DO NOT EDIT.
package main package main
var githash = "7e8a34a" var githash = "3c785de"
var branch = "v2" var branch = "v2"
var buildstamp = "2023-06-29_21:19:42" var buildstamp = "2023-06-29_21:24:17"
var commits = "57" var commits = "58"
var version = "7e8a34a-b57 - 2023-06-29_21:19:42" var version = "3c785de-b58 - 2023-06-29_21:24:17"

2
zfs.go
View File

@ -272,8 +272,6 @@ func (fs *ZfsFs) DelSnapshot(name string) error {
log.WithFields(log.Fields{"box": fs.zfs.box.name, "fs": fs.path, "name": name}).Debugf("zfs destroy " + fs.path + "@" + name) log.WithFields(log.Fields{"box": fs.zfs.box.name, "fs": fs.path, "name": name}).Debugf("zfs destroy " + fs.path + "@" + name)
return nil
if _, err := fs.zfs.box.Exec("zfs destroy " + fs.path + "@" + name); err != nil { if _, err := fs.zfs.box.Exec("zfs destroy " + fs.path + "@" + name); err != nil {
log.WithFields(log.Fields{"box": fs.zfs.box.name, "fs": fs.path, "name": name, "error": err}).Errorf("") log.WithFields(log.Fields{"box": fs.zfs.box.name, "fs": fs.path, "name": name, "error": err}).Errorf("")
return err return err