Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
101 changes: 18 additions & 83 deletions cmd/checkpoint.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
package cmd

import (
"context"
"fmt"
"time"

truenas "github.com/deevus/truenas-go"
"github.com/dustin/go-humanize"
"github.com/spf13/cobra"

"github.com/deevus/pixels/internal/cache"
"github.com/deevus/pixels/internal/ssh"
tnc "github.com/deevus/pixels/internal/truenas"
)

func init() {
Expand Down Expand Up @@ -52,63 +46,38 @@ func init() {
rootCmd.AddCommand(cpCmd)
}

// resolveDatasetPath returns the ZFS dataset path for a container.
// Priority: config override > auto-detect from virt.global.config.
func resolveDatasetPath(ctx context.Context, client *tnc.Client, name string) (string, error) {
if cfg.Checkpoint.DatasetPrefix != "" {
return cfg.Checkpoint.DatasetPrefix + "/" + containerName(name), nil
}
return client.ContainerDataset(ctx, containerName(name))
}

func runCheckpointCreate(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
name := args[0]
label, _ := cmd.Flags().GetString("label")

if label == "" {
label = "px-" + time.Now().Format("20060102-150405")
}

client, err := connectClient(ctx)
sb, err := openSandbox()
if err != nil {
return err
}
defer client.Close()
defer sb.Close()

ds, err := resolveDatasetPath(ctx, client, name)
if err != nil {
if err := sb.CreateSnapshot(cmd.Context(), name, label); err != nil {
return err
}

_, err = client.Snapshot.Create(ctx, truenas.CreateSnapshotOpts{
Dataset: ds,
Name: label,
})
if err != nil {
return fmt.Errorf("creating checkpoint: %w", err)
}

fmt.Fprintf(cmd.OutOrStdout(), "Checkpoint %q created for %s\n", label, name)
return nil
}

func runCheckpointList(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
name := args[0]

client, err := connectClient(ctx)
sb, err := openSandbox()
if err != nil {
return err
}
defer client.Close()
defer sb.Close()

ds, err := resolveDatasetPath(ctx, client, name)
if err != nil {
return err
}

snapshots, err := client.ListSnapshots(ctx, ds)
snapshots, err := sb.ListSnapshots(cmd.Context(), name)
if err != nil {
return err
}
Expand All @@ -121,84 +90,50 @@ func runCheckpointList(cmd *cobra.Command, args []string) error {
w := newTabWriter(cmd)
fmt.Fprintln(w, "LABEL\tSIZE")
for _, s := range snapshots {
fmt.Fprintf(w, "%s\t%s\n", s.SnapshotName, humanize.IBytes(uint64(s.Referenced)))
fmt.Fprintf(w, "%s\t%s\n", s.Label, humanize.IBytes(uint64(s.Size)))
}
return w.Flush()
}

func runCheckpointRestore(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
name, label := args[0], args[1]

client, err := connectClient(ctx)
sb, err := openSandbox()
if err != nil {
return err
}
defer client.Close()

ds, err := resolveDatasetPath(ctx, client, name)
if err != nil {
return err
}
sid := ds + "@" + label
defer sb.Close()

start := time.Now()

fmt.Fprintf(cmd.ErrOrStderr(), "Stopping %s...\n", name)
if err := client.Virt.StopInstance(ctx, containerName(name), truenas.StopVirtInstanceOpts{
Timeout: 30,
}); err != nil {
return fmt.Errorf("stopping %s: %w", name, err)
}
fmt.Fprintf(cmd.ErrOrStderr(), "Restoring %s to %q...\n", name, label)

if err := client.SnapshotRollback(ctx, sid); err != nil {
if err := sb.RestoreSnapshot(cmd.Context(), name, label); err != nil {
return err
}

if err := client.Virt.StartInstance(ctx, containerName(name)); err != nil {
return fmt.Errorf("starting %s: %w", name, err)
}

instance, err := client.Virt.GetInstance(ctx, containerName(name))
if err != nil {
return fmt.Errorf("refreshing %s: %w", name, err)
}

ip := resolveIP(instance)
cache.Put(name, &cache.Entry{IP: ip, Status: instance.Status})
if ip != "" {
if err := ssh.WaitReady(ctx, ip, 30*time.Second, nil); err != nil {
fmt.Fprintf(cmd.ErrOrStderr(), "Warning: SSH not ready: %v\n", err)
}
}

elapsed := time.Since(start).Truncate(100 * time.Millisecond)
fmt.Fprintf(cmd.OutOrStdout(), "Restored %s to %q in %s\n", name, label, elapsed)
if ip != "" {
fmt.Fprintf(cmd.OutOrStdout(), " SSH: ssh %s@%s\n", cfg.SSH.User, ip)

inst, err := sb.Get(cmd.Context(), name)
if err == nil && len(inst.Addresses) > 0 {
fmt.Fprintf(cmd.OutOrStdout(), " SSH: ssh %s@%s\n", cfg.SSH.User, inst.Addresses[0])
}
return nil
}

func runCheckpointDelete(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
name, label := args[0], args[1]

client, err := connectClient(ctx)
sb, err := openSandbox()
if err != nil {
return err
}
defer client.Close()
defer sb.Close()

ds, err := resolveDatasetPath(ctx, client, name)
if err != nil {
if err := sb.DeleteSnapshot(cmd.Context(), name, label); err != nil {
return err
}
sid := ds + "@" + label

if err := client.Snapshot.Delete(ctx, sid); err != nil {
return fmt.Errorf("deleting checkpoint: %w", err)
}

fmt.Fprintf(cmd.OutOrStdout(), "Deleted checkpoint %q from %s\n", label, name)
return nil
Expand Down
37 changes: 4 additions & 33 deletions cmd/destroy.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,11 @@ package cmd

import (
"bufio"
"context"
"fmt"
"os"
"strings"
"time"

truenas "github.com/deevus/truenas-go"
"github.com/spf13/cobra"

"github.com/deevus/pixels/internal/cache"
"github.com/deevus/pixels/internal/retry"
)

func init() {
Expand All @@ -27,7 +21,6 @@ func init() {
}

func runDestroy(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
name := args[0]
force, _ := cmd.Flags().GetBool("force")

Expand All @@ -44,38 +37,16 @@ func runDestroy(cmd *cobra.Command, args []string) error {
}
}

client, err := connectClient(ctx)
sb, err := openSandbox()
if err != nil {
return err
}
defer client.Close()

instance, err := client.Virt.GetInstance(ctx, containerName(name))
if err != nil {
return fmt.Errorf("looking up %s: %w", name, err)
}
if instance == nil {
return fmt.Errorf("pixel %q not found", name)
}
defer sb.Close()

if instance.Status == "RUNNING" {
fmt.Fprintf(cmd.ErrOrStderr(), "Stopping %s...\n", name)
if err := client.Virt.StopInstance(ctx, containerName(name), truenas.StopVirtInstanceOpts{
Timeout: 30,
}); err != nil {
return fmt.Errorf("stopping %s: %w", name, err)
}
}

// Retry delete — Incus sometimes needs a moment after stop for the
// storage volume to be fully released.
if err := retry.Do(ctx, 3, 2*time.Second, func(ctx context.Context) error {
return client.Virt.DeleteInstance(ctx, containerName(name))
}); err != nil {
return fmt.Errorf("deleting %s: %w", name, err)
if err := sb.Delete(cmd.Context(), name); err != nil {
return err
}

cache.Delete(name)
fmt.Fprintf(cmd.OutOrStdout(), "Destroyed %s\n", name)
return nil
}
8 changes: 7 additions & 1 deletion cmd/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"os"
"time"

"al.essio.dev/pkg/shellescape"
"github.com/spf13/cobra"

"github.com/deevus/pixels/internal/ssh"
Expand Down Expand Up @@ -38,7 +39,12 @@ func runExec(cmd *cobra.Command, args []string) error {
return err
}

exitCode, err := ssh.Exec(ctx, ssh.ConnConfig{Host: ip, User: cfg.SSH.User, KeyPath: cfg.SSH.Key, Env: cfg.EnvForward}, command)
// Wrap in a login shell so ~/.profile is sourced (adds ~/.local/bin to PATH).
// Activate mise if installed so tools it manages (claude, node, etc.) are on PATH.
// Pass as a single string so SSH's argument concatenation preserves quoting.
inner := shellescape.QuoteCommand(command)
loginCmd := []string{"bash -lc " + shellescape.Quote("eval \"$(mise activate bash 2>/dev/null)\"; "+inner)}
exitCode, err := ssh.Exec(ctx, ssh.ConnConfig{Host: ip, User: cfg.SSH.User, KeyPath: cfg.SSH.Key, Env: cfg.EnvForward}, loginCmd)
if err != nil {
return err
}
Expand Down
17 changes: 6 additions & 11 deletions cmd/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ func init() {
}

func runList(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()

client, err := connectClient(ctx)
sb, err := openSandbox()
if err != nil {
return err
}
defer client.Close()
defer sb.Close()

instances, err := client.ListInstances(ctx)
instances, err := sb.List(cmd.Context())
if err != nil {
return err
}
Expand All @@ -38,13 +36,10 @@ func runList(cmd *cobra.Command, _ []string) error {
fmt.Fprintln(w, "NAME\tSTATUS\tIP")
for _, inst := range instances {
ip := "—"
for _, a := range inst.Aliases {
if (a.Type == "INET" || a.Type == "ipv4") && a.Address != "" {
ip = a.Address
break
}
if len(inst.Addresses) > 0 {
ip = inst.Addresses[0]
}
fmt.Fprintf(w, "%s\t%s\t%s\n", displayName(inst.Name), inst.Status, ip)
fmt.Fprintf(w, "%s\t%s\t%s\n", inst.Name, inst.Status, ip)
}
return w.Flush()
}
Loading