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

gocage migrate now synchronize destination dataset after stoppoing jail

Browse Source
This commit is contained in:
yo 2022-06-18 11:09:06 +02:00
parent a446a19a08
commit 7356c0d3d0
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
cmd/migrate.go
View File

@ -6,9 +6,6 @@ import (
"bufio" "bufio"
"errors" "errors"
"strings" "strings"
/* "regexp"
"time"
*/
) )
const ( const (
@ -43,7 +40,7 @@ func MigrateJail(args []string) {
return return
} }
if cj.Running == true { if cj.Running == true && gYesToAll == false {
fmt.Printf("WARNING: Jail %s is running\n", cj.Name) fmt.Printf("WARNING: Jail %s is running\n", cj.Name)
fmt.Printf("Migration will stop it for data sync before starting on the new pool. You will be prompted for shutdown.\n") fmt.Printf("Migration will stop it for data sync before starting on the new pool. You will be prompted for shutdown.\n")
fmt.Printf("Continue? (y/n) ") fmt.Printf("Continue? (y/n) ")
@ -104,17 +101,19 @@ func MigrateJail(args []string) {
// Running jail needs a last snapshot for an incremental send/recv after shutting down. // Running jail needs a last snapshot for an incremental send/recv after shutting down.
if cj.Running == true { if cj.Running == true {
fmt.Printf("Shutdown jail %s for last data sync, this could take some time.\n", cj.Name) fmt.Printf("Shutdown jail %s for last data sync, this could take some time.\n", cj.Name)
fmt.Printf("Continue? (y/n) ") if gYesToAll == false {
scanr := bufio.NewScanner(os.Stdin) fmt.Printf("Continue? (y/n) ")
scanr.Scan() scanr := bufio.NewScanner(os.Stdin)
if false == strings.EqualFold(scanr.Text(), "y") { scanr.Scan()
fmt.Printf("Migration aborted. Now cleaning destination pool.\n") if false == strings.EqualFold(scanr.Text(), "y") {
if err := CleanMigrateMess([]string{cj.Name}); err != nil { fmt.Printf("Migration aborted. Now cleaning destination pool.\n")
fmt.Printf("Error: %v\n", err) if err := CleanMigrateMess([]string{cj.Name}); err != nil {
fmt.Printf("Error: %v\n", err)
}
// TODO : Remove destination datasets, or handle the cas at the beginning of current function
// (when snapshot already exist on source and dest)
return
} }
// TODO : Remove destination datasets, or handle the cas at the beginning of current function
// (when snapshot already exist on source and dest)
return
} }
StopJail([]string{cj.Name}) StopJail([]string{cj.Name})
@ -132,22 +131,32 @@ 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),
dsconfdest); err != nil { dsconfdest); err != nil {
fmt.Printf("Error: %v\n", err) fmt.Printf("Error: %v\n", err)
} return
fmt.Printf("Done\n") }
fmt.Printf("Done\n")
fmt.Printf("Synchronize jail filesystem dataset to %s: ", dsdatadest) fmt.Printf("Synchronize jail filesystem dataset to %s: ", dsdatadest)
if err := zfsCopyIncremental(fmt.Sprintf("%s@gocage_mig_init", dsdata), if err := zfsCopyIncremental(fmt.Sprintf("%s@gocage_mig_init", dsdata),
fmt.Sprintf("%s@gocage_mig_last_sync", dsdata), fmt.Sprintf("%s@gocage_mig_last_sync", dsdata),
dsdatadest); err != nil { dsdatadest); err != nil {
return
fmt.Printf("Error: %v\n", err) fmt.Printf("Error: %v\n", err)
} }
fmt.Printf("Done\n") fmt.Printf("Done\n")
// TODO : Start jail on new datastore (! Currently ListJails won't support the double with same name !) // TODO : Start jail on new datastore (! Currently ListJails won't support 2 jails with same name !)
// TODO : zfs destroy destpool/jails/jail_name@gocage_mig_first_snap // TODO : zfs destroy destpool/jails/jail_name@gocage_mig_first_snap
// TODO : zfs destroy destpool/jails/jail_name/root@gocage_mig_first_snap // TODO : zfs destroy destpool/jails/jail_name/root@gocage_mig_first_snap

8
cmd/utils.go
View File

@ -269,17 +269,17 @@ func zfsCopy(src string, dest string) error {
return nil return nil
} }
// Copy incremental snasphot to destination
func zfsCopyIncremental(firstsnap string, lastsnap string, dest string) error { func zfsCopyIncremental(firstsnap string, secondsnap string, dest string) error {
// First, declare sending process & pipe // First, declare sending process & pipe
cmd_send := exec.Command("zfs", "send", "-i", firstsnap, lastsnap) cmd_send := exec.Command("zfs", "send", "-i", firstsnap, secondsnap)
stdout_send, err := cmd_send.StdoutPipe() stdout_send, err := cmd_send.StdoutPipe()
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("Error: %v\n", err)) return errors.New(fmt.Sprintf("Error: %v\n", err))
} }
// then declare receiving process & pipe // then declare receiving process & pipe
cmd_recv := exec.Command("zfs", "receive", 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 {
return errors.New(fmt.Sprintf("Error: %v\n", err)) return errors.New(fmt.Sprintf("Error: %v\n", err))