getcompanion-ai/computer-host
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/computer-host.git synced 2026-04-15 13:03:41 +00:00
Code Issues 6 Projects Releases Packages Wiki Activity Actions

revert: undo 4 racing/reconcile fix commits

Browse source
This commit is contained in:
Harivansh Rathi 2026-04-11 18:11:25 +00:00
parent 637036b8c8
commit 0e5e989192
5 changed files with 29 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/firecracker/runtime.go
View file

@ -125,13 +125,7 @@ func (r *Runtime) Boot(ctx context.Context, spec MachineSpec, usedNetworks []Net
return nil, fmt.Errorf("write config file: %w", err)
}
metadataFilePath, err := writeMetadataFile(paths.ChrootRootDir, spec)
if err != nil {
cleanup(network, paths, nil, 0)
return nil, fmt.Errorf("write metadata file: %w", err)
}
command, err := launchJailedFirecracker(paths, spec.ID, r.firecrackerBinaryPath, r.jailerBinaryPath, r.enablePCI, configFilePath, metadataFilePath)
command, err := launchJailedFirecracker(paths, spec.ID, r.firecrackerBinaryPath, r.jailerBinaryPath, r.enablePCI, configFilePath)
if err != nil {
cleanup(network, paths, nil, 0)
return nil, err
@ -143,6 +137,18 @@ func (r *Runtime) Boot(ctx context.Context, spec MachineSpec, usedNetworks []Net
}
socketPath := procSocketPath(firecrackerPID)
if spec.MMDS != nil && spec.MMDS.Data != nil {
client := newAPIClient(socketPath)
if err := waitForSocket(ctx, client, socketPath); err != nil {
cleanup(network, paths, command, firecrackerPID)
return nil, fmt.Errorf("wait for firecracker socket: %w", err)
}
if err := client.PutMMDS(ctx, spec.MMDS.Data); err != nil {
cleanup(network, paths, command, firecrackerPID)
return nil, fmt.Errorf("put mmds data: %w", err)
}
}
now := time.Now().UTC()
state := MachineState{
ID: spec.ID,
@ -282,7 +288,7 @@ func (r *Runtime) RestoreBoot(ctx context.Context, loadSpec SnapshotLoadSpec, us
return nil, err
}
command, err := launchJailedFirecracker(paths, loadSpec.ID, r.firecrackerBinaryPath, r.jailerBinaryPath, r.enablePCI, "", "")
command, err := launchJailedFirecracker(paths, loadSpec.ID, r.firecrackerBinaryPath, r.jailerBinaryPath, r.enablePCI, "")
if err != nil {
cleanup(network, paths, nil, 0)
return nil, err