Skip to content
Open
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
45 changes: 41 additions & 4 deletions internal/qemu/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -1551,9 +1551,41 @@ func (m *Manager) createFromGolden(ctx context.Context, cfg types.SandboxConfig,
m.cleanupVM(netCfg, sandboxDir)
return nil, err
}
vm.agent = agentClient
log.Printf("qemu: golden-create %s: agent connected (%dms)", id, time.Since(t0).Milliseconds())

// A connected virtio-serial socket is not proof that the restored guest agent can
// serve RPCs. A stale listener can accept the connection while every RPC hangs; if
// we continue, network setup and log configuration can hold the public create
// request until the edge returns 524 and leave an unusable VM marked running.
// Probe once, redial once for the known post-loadvm stale-connection case, then
// reject this golden restore so Create can fall back to a clean cold boot.
pingOnce := func() error {
pingCtx, pingCancel := context.WithTimeout(ctx, 3*time.Second)
defer pingCancel()
_, pingErr := agentClient.Ping(pingCtx)
return pingErr
}
pingErr := pingOnce()
if pingErr != nil && IsTransportError(pingErr) && ctx.Err() == nil {
log.Printf("qemu: golden-create %s: readiness ping failed (%v), redialing once", id, pingErr)
if redialErr := agentClient.Redial(); redialErr != nil {
pingErr = fmt.Errorf("redial after readiness ping: %w", redialErr)
} else {
pingErr = pingOnce()
}
}
if pingErr != nil {
log.Printf("qemu: golden-create %s: ABORT agent RPC unavailable, falling back to cold boot: %v", id, pingErr)
_ = agentClient.Close()
qmpClient.Close()
_ = cmd.Process.Kill()
_ = cmd.Wait()
m.cleanupVM(netCfg, sandboxDir)
return nil, fmt.Errorf("golden agent readiness: %w", pingErr)
}
vm.agent = agentClient
log.Printf("qemu: golden-create %s: agent ready (%dms)", id, time.Since(t0).Milliseconds())

// The golden RAM is captured with the rootfs fsfrozen for a consistent
// snapshot (see PrepareGoldenSnapshot). Thaw it now — before block_resize,
// env injection, or any customer write — exactly as the wake path thaws
Expand Down Expand Up @@ -1628,8 +1660,15 @@ func (m *Manager) createFromGolden(ctx context.Context, cfg types.SandboxConfig,

// Patch network inside the guest — the snapshot had the golden VM's IP
if err := patchGuestNetwork(context.Background(), agentClient, netCfg); err != nil {
log.Printf("qemu: golden-create %s: network patch failed: %v", id, err)
log.Printf("qemu: golden-create %s: ABORT network patch failed, falling back to cold boot: %v", id, err)
_ = agentClient.Close()
qmpClient.Close()
_ = cmd.Process.Kill()
_ = cmd.Wait()
m.cleanupVM(netCfg, sandboxDir)
return nil, fmt.Errorf("golden network patch: %w", err)
}
log.Printf("qemu: golden-create %s: network patched (%dms)", id, time.Since(t0).Milliseconds())

// Sync guest clock — golden snapshot has stale time
if err := syncGuestClock(context.Background(), agentClient); err != nil {
Expand Down Expand Up @@ -1676,8 +1715,6 @@ func (m *Manager) createFromGolden(ctx context.Context, cfg types.SandboxConfig,
log.Printf("qemu: golden-create %s: mount /home/sandbox failed: %v", id, mountErr)
}
}
log.Printf("qemu: golden-create %s: network patched (%dms)", id, time.Since(t0).Milliseconds())

envsToInject := m.sealSandboxEnvs(context.Background(), id, netCfg, agentClient, cfg)
if len(envsToInject) > 0 {
envCtx, envCancel := context.WithTimeout(context.Background(), 5*time.Second)
Expand Down
10 changes: 8 additions & 2 deletions internal/worker/grpc_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,17 @@ func (s *GRPCServer) configureLogshipForSandbox(ctx context.Context, sandboxID s
log.Printf("grpc: ConfigureLogship skipped for %s: manager %T does not implement LogshipConfigurator", sandboxID, s.manager)
return
}
// Log shipping is best-effort and must never inherit the entire public
// sandbox-create deadline. A guest that becomes unresponsive after boot
// otherwise holds create open until the edge times out, even though this
// function explicitly treats log setup as non-fatal.
logshipCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
var orgID string
if s.store != nil {
orgID, _ = s.store.GetSandboxOrgID(ctx, sandboxID)
orgID, _ = s.store.GetSandboxOrgID(logshipCtx, sandboxID)
}
if err := cfger.ConfigureLogship(ctx, sandboxID, s.axiomIngestToken, s.axiomDataset, orgID); err != nil {
if err := cfger.ConfigureLogship(logshipCtx, sandboxID, s.axiomIngestToken, s.axiomDataset, orgID); err != nil {
log.Printf("grpc: ConfigureLogship for %s failed: %v (logs disabled for this sandbox)", sandboxID, err)
return
}
Expand Down