force zfs recv when sending incrementally too

This commit is contained in:
shoopea 2022-06-17 21:52:39 +08:00
parent 4d24ded4d7
commit 324710825d
2 changed files with 5 additions and 5 deletions

2
app.go
View File

@ -624,7 +624,7 @@ func (a AppConfig) SendSnapshots() (err error) {
if err != nil && err.Error() != "no snapshot" { if err != nil && err.Error() != "no snapshot" {
return return
} }
_, err = cfg.Box[dest.Box()].SSHExec("ssh " + cfg.Box[src.Box()].User + "@" + src.Box() + " zfs send -I " + string(sCurrSnapshot) + " " + string(sNextSnapshot) + " | zfs recv " + dest.Path() + "/" + src.Box() + "/" + src.Path()) _, err = cfg.Box[dest.Box()].SSHExec("ssh " + cfg.Box[src.Box()].User + "@" + src.Box() + " zfs send -I " + string(sCurrSnapshot) + " " + string(sNextSnapshot) + " | zfs recv -F " + dest.Path() + "/" + src.Box() + "/" + src.Path())
if err != nil { if err != nil {
if *debugFlag { if *debugFlag {
log.Printf("AppConfig.SendSnapshots : %s : Sending snapshot on %s from %s failed (%s)", a.Name, dest.Box(), string(sNextSnapshot), err) log.Printf("AppConfig.SendSnapshots : %s : Sending snapshot on %s from %s failed (%s)", a.Name, dest.Box(), string(sNextSnapshot), err)

View File

@ -1,6 +1,6 @@
// Code generated by version.sh (@generated) DO NOT EDIT. // Code generated by version.sh (@generated) DO NOT EDIT.
package main package main
var githash = "e62627e" var githash = "4d24ded"
var buildstamp = "2022-06-17_13:44:04" var buildstamp = "2022-06-17_13:52:07"
var commits = "35" var commits = "36"
var version = "e62627e-b35 - 2022-06-17_13:44:04" var version = "4d24ded-b36 - 2022-06-17_13:52:07"