Skip to content

fix: restore --force relaunches under the launch-scoped VNC contract #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CMGS merged 5 commits into from
Sep 2, 2026
Merged

fix: restore --force relaunches under the launch-scoped VNC contract #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea15646
fix: restore --force relaunches under the launch-scoped VNC contract
CMGS Sep 2, 2026
175fc6d
fix: persist the stopped record before restore's fallible steps; laun…
CMGS Sep 2, 2026
84ece91
fix: stop the VNC proxy with QEMU in restore, not only at relaunch
CMGS Sep 2, 2026
8d48279
review: one owner for the stopped-record tail; drop the proxy stop la…
CMGS Sep 2, 2026
6bd617b
review: one fact per comment line on saveStopped
CMGS Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions cmd/vm/lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ func (h *Handler) Stop(cmd *cobra.Command, args []string) error {
}
terminate(ctx, r, grace)
quiesceNet(cmd, r)
stopVNCProxy(ctx, dir)
r.PID, r.VNCDisp, r.VNCPass = 0, -1, "" // VNC is launch-scoped: gone with the qemu it belonged to
return saveRec(dir, r)
return saveStopped(ctx, dir, r)
}); err != nil {
return err
}
Expand Down Expand Up @@ -264,6 +262,7 @@ func (h *Handler) launch(cmd *cobra.Command, dir string, r *record) error {
}
pidfile := filepath.Join(dir, "qemu.pid")
args := append(spec.Args(), "-daemonize", "-pidfile", pidfile)
stopVNCProxy(ctx, dir)
ensureNetnsLoopback(ctx, r) // CNI: a fresh netns has lo DOWN, so qemu's -vnc 127.0.0.1 would fail to bind
if r.Netns != "" {
logger.Debugf(ctx, "running qemu in netns %s via `ip netns exec`", filepath.Base(r.Netns))
Expand All @@ -272,7 +271,6 @@ func (h *Handler) launch(cmd *cobra.Command, dir string, r *record) error {
c := launchCmd(r, args) // CNI: wraps in `ip netns exec` so -netdev tap finds the in-netns TAP
c.Stdout, c.Stderr = os.Stdout, os.Stderr
if err := c.Run(); err != nil {
stopVNCProxy(ctx, dir)
return fmt.Errorf("launch qemu: %w", err)
}
pid, err := utils.ReadPIDFile(pidfile)
Expand Down
4 changes: 3 additions & 1 deletion cmd/vm/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ func (h *Handler) Restore(cmd *cobra.Command, args []string) error {
return fmt.Errorf("vm %q is running; stop it first or pass --force to stop+restore", r.Name)
}
terminate(ctx, r, stopGracePeriod)
r.PID = 0
if err := saveStopped(ctx, dir, r); err != nil {
return err
}
}
tag, _ = cmd.Flags().GetString("tag")
if tag == "" {
Expand Down
7 changes: 7 additions & 0 deletions cmd/vm/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,13 @@ func terminate(ctx context.Context, r *record, grace time.Duration) {
}
}

// VNC is launch-scoped: the proxy and display go with the qemu process.
func saveStopped(ctx context.Context, dir string, r *record) error {
stopVNCProxy(ctx, dir)
r.PID, r.VNCDisp, r.VNCPass = 0, -1, ""
return saveRec(dir, r)
}

func graceFromFlags(cmd *cobra.Command) time.Duration {
if force, _ := cmd.Flags().GetBool("force"); force {
return 0
Expand Down