yo/gocage
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Comments

Browse Source
This commit is contained in:
yo 2022-06-18 16:34:06 +02:00
parent 2151034a02
commit 1c04f62ed8
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/migrate.go
View File

@ -138,13 +138,6 @@ func MigrateJail(args []string) {
} }
fmt.Printf("Done\n") fmt.Printf("Done\n")
// FIXME : config DS sync fails with :
/* cannot receive incremental stream: destination qstore/iocage/jails/kibana has been modified
* since most recent snapshot
*/
// It needs a "zfs rollback destconf@gocage_mig_init" to be able to sync.
// UPDATE 06/06/2022 : Should be fixed using "-Fu" zfs recv flag
fmt.Printf("Synchronize jail config to %s: ", dsconfdest) fmt.Printf("Synchronize jail config to %s: ", dsconfdest)
if err := zfsCopyIncremental(fmt.Sprintf("%s@gocage_mig_init", dsconf), if err := zfsCopyIncremental(fmt.Sprintf("%s@gocage_mig_init", dsconf),
fmt.Sprintf("%s@gocage_mig_last_sync", dsconf), fmt.Sprintf("%s@gocage_mig_last_sync", dsconf),

2
cmd/utils.go
View File

@ -285,6 +285,8 @@ func zfsCopyIncremental(firstsnap string, secondsnap string, dest string) error
} }
// then declare receiving process & pipe // then declare receiving process & pipe
/* "-Fu" flags to avoid "cannot receive incremental stream: destination qstore/iocage/jails/kibana has been modified
* since most recent snapshot" error message */
cmd_recv := exec.Command("zfs", "receive", "-Fu", dest) cmd_recv := exec.Command("zfs", "receive", "-Fu", dest)
stdin_recv, err := cmd_recv.StdinPipe() stdin_recv, err := cmd_recv.StdinPipe()
if err != nil { if err != nil {