addr.go

@@ -84,7 +84,7 @@ func (a Addr) ValidSnapshots() ([]*ZfsSnapshot, error) {
 	}
 }
 
-func (a Addr) SetManaged(managed bool) error {
+func (a Addr) SetManaged(val bool) error {
 	log.WithFields(log.Fields{"addr": a}).Debugf("starting")
 	defer log.WithFields(log.Fields{"addr": a}).Debugf("done")
 
@@ -99,9 +99,9 @@ func (a Addr) SetManaged(managed bool) error {
 	} else {
 		fs.mx.Lock()
 		defer fs.mx.Unlock()
-		if fs.managed != managed {
+		if fs.managed != val {
 			var cmd string
-			if managed {
+			if val {
 				cmd = fmt.Sprintf("zfs set %s=+ %s", zfsManagedPropertyName, a.Path())
 			} else {
 				cmd = fmt.Sprintf("zfs set %s=- %s", zfsManagedPropertyName, a.Path())
@@ -111,7 +111,7 @@ func (a Addr) SetManaged(managed bool) error {
 				return err
 			}
 		}
-		fs.managed = managed
+		fs.managed = val
 		return nil
 	}
 }

app.go

@@ -478,7 +478,7 @@ func (a *App) Transfer() error {
 	defer log.WithFields(log.Fields{"app": a.name}).Debugf("done")
 
 	for _, src := range a.sources {
-		dests := make([]Addr, 0)
+		backedUp := false
 		for _, dest := range a.destinations {
 			dest2 := dest.Append("/" + src.Box() + "/" + src.Path())
 			if dest2.Online() {
@@ -486,17 +486,18 @@ func (a *App) Transfer() error {
 					log.WithFields(log.Fields{"app": a.name, "call": "Mkdir", "attr": dest, "error": err}).Errorf("")
 					return err
 				}
+				if err := TransferZfs(src, dest2); err != nil {
+					log.WithFields(log.Fields{"app": a.name, "call": "TransferZfs", "src": src, "dest": dest, "error": err}).Errorf("")
+					return err
+				}
 				if err := dest2.SetManaged(true); err != nil {
 					log.WithFields(log.Fields{"app": a.name, "call": "SetManaged", "src": src, "dest": dest, "error": err}).Errorf("")
 					return err
 				}
-				dests = append(dests, dest2)
+				backedUp = true
 			}
 		}
-		if n, err := TransferZfs(src, dests); err != nil {
+		if backedUp {
-			log.WithFields(log.Fields{"app": a.name, "call": "TransferZfs", "src": src, "dests": dests, "error": err}).Errorf("")
-			return err
-		} else if n > 0 {
 			if err := src.SetBackedUp(true); err != nil {
 				log.WithFields(log.Fields{"app": a.name, "call": "SetBackedUp", "src": src, "error": err}).Errorf("")
 				return err

box.go

@@ -139,39 +139,22 @@ func (b *Box) Exec(cmd string) (r string, err error) {
 	return s.Exec(cmd)
 }
 
-func TransferZfs(from Addr, to []Addr) (int, error) {
+func TransferZfs(from, to Addr) error {
-	log.WithFields(log.Fields{"from": from, "to": to}).Debugf("starting")
-	defer log.WithFields(log.Fields{"from": from, "to": to}).Debugf("done")
-
-	count := 0
-
-	dests := make([]Addr, 0)
-	for _, dest := range to {
-		if cfg.box[from.Box()].allowDirectConnect && cfg.box[dest.Box()].allowDirectConnect {
-			if err := TransferDirectZfs(from, dest); err != nil {
-				log.WithFields(log.Fields{"from": from, "to": to, "call": "TransferDirectZfs", "attr": dest, "error": err}).Errorf("")
-				return count, err
-			} else {
-				count++
-			}
-		} else {
-			dests = append(dests, dest)
-		}
-	}
-
-	return count, nil
-
-}
-
-func TransferDirectZfs(from, to Addr) error {
 	log.WithFields(log.Fields{"from": from, "to": to}).Debugf("starting")
 	defer log.WithFields(log.Fields{"from": from, "to": to}).Debugf("done")
 
 	var (
 		err                        error
 		fromSnapshots, toSnapshots []*ZfsSnapshot
+		directTransfer             bool
 	)
 
+	if cfg.box[from.Box()].allowDirectConnect && cfg.box[to.Box()].allowDirectConnect {
+		directTransfer = true
+	} else {
+		directTransfer = false
+	}
+
 	if fromSnapshots, err = from.ValidSnapshots(); err != nil {
 		log.WithFields(log.Fields{"from": from, "to": to, "call": "ValidSnapshots", "attr": from, "error": err}).Errorf("")
 		return err
@@ -188,6 +171,7 @@ func TransferDirectZfs(from, to Addr) error {
 
 	if len(toSnapshots) == 0 {
 		log.WithFields(log.Fields{"from": from, "to": to}).Debugf("initiating destination")
+		if directTransfer {
 			if _, err := to.BoxExec("ssh " + from.Box() + " zfs send " + fromSnapshots[0].String() + " | zfs recv -F " + to.Path()); err != nil {
 				log.WithFields(log.Fields{"from": from, "to": to, "call": "BoxExec", "error": err}).Errorf("")
 				return err
@@ -195,23 +179,21 @@ func TransferDirectZfs(from, to Addr) error {
 			newToSnapshot := &ZfsSnapshot{name: fromSnapshots[0].name, fs: cfg.box[to.Box()].zfs.filesystems[to.Path()]}
 			toSnapshots = append(toSnapshots, newToSnapshot)
 			cfg.box[to.Box()].zfs.filesystems[to.Path()].AddSnapshot(newToSnapshot)
+		} else {
+			//handle indirect transfer
+		}
 
 	}
 
-	fromFromSnapshotId := len(fromSnapshots) - 1
+	fromFromSnapshotId := -1
-	fromToSnapshotId := -1
+	lastToSnapshot := toSnapshots[len(toSnapshots)-1]
-	for fromFromSnapshotId >= 0 {
+	log.WithFields(log.Fields{"from": from, "to": to}).Debugf("searching last snapshot %s", lastToSnapshot.String())
-		fromToSnapshotId = len(toSnapshots) - 1
+	for id, v := range fromSnapshots {
-		for fromToSnapshotId >= 0 {
+		if v.name == lastToSnapshot.name {
-			if fromSnapshots[fromFromSnapshotId].name == toSnapshots[fromToSnapshotId].name {
+			fromFromSnapshotId = id
+			log.WithFields(log.Fields{"from": from, "to": to}).Debugf("found %s", v.String())
 			break
 		}
-			fromToSnapshotId = fromToSnapshotId - 1
-		}
-		if fromToSnapshotId >= 0 {
-			break
-		}
-		fromFromSnapshotId = fromFromSnapshotId - 1
 	}
 
 	if fromFromSnapshotId == -1 {
@@ -222,10 +204,14 @@ func TransferDirectZfs(from, to Addr) error {
 
 	if fromFromSnapshotId < len(fromSnapshots)-1 {
 		log.WithFields(log.Fields{"from": from, "to": to}).Debugf("transfering from %s to %s", fromSnapshots[fromFromSnapshotId].name, fromSnapshots[len(fromSnapshots)-1].name)
+		if directTransfer {
 			if _, err := to.BoxExec("ssh " + from.Box() + " zfs send -I " + fromSnapshots[fromFromSnapshotId].String() + " " + fromSnapshots[len(fromSnapshots)-1].String() + " | zfs recv -F " + to.Path()); err != nil {
 				log.WithFields(log.Fields{"from": from, "to": to, "call": "BoxExec", "error": err}).Errorf("")
 				return err
 			}
+		} else {
+			// handle indirect transfer
+		}
 
 		for _, v := range fromSnapshots[fromFromSnapshotId+1:] {
 			cfg.box[to.Box()].zfs.filesystems[to.Path()].AddSnapshot(&ZfsSnapshot{name: v.name, fs: cfg.box[to.Box()].zfs.filesystems[to.Path()]})

version.go

@@ -1,7 +1,7 @@
 // Code generated by version.sh (@generated) DO NOT EDIT.
 package main
-var githash = "2ca0695"
+var githash = "1a1713e"
-var branch = "master"
+var branch = "v2"
-var buildstamp = "2023-09-10_16:42:46"
+var buildstamp = "2023-08-21_12:35:47"
-var commits = "87"
+var commits = "83"
-var version = "2ca0695-b87 - 2023-09-10_16:42:46"
+var version = "1a1713e-b83 - 2023-08-21_12:35:47"

zfs.go

@@ -311,9 +311,6 @@ func (fs *ZfsFs) AddSnapshot(s *ZfsSnapshot) error {
 }
 
 func (fs *ZfsFs) ValidSnapshots() []*ZfsSnapshot {
-	log.WithFields(log.Fields{"box": fs.zfs.box.name, "fs": fs.path}).Debugf("starting")
-	defer log.WithFields(log.Fields{"box": fs.zfs.box.name, "fs": fs.path}).Debugf("done")
-
 	tab := make([]*ZfsSnapshot, 0)
 
 	for _, s := range fs.snapshots {