Skip to content

fix(api): remove sandbox from store only on successful removal #2237

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

Draft
jakubno wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

fix(api): remove sandbox from store only on successful removal #2237

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6cf35a
fix(api): remove sandbox from store only on successful removal
jakubno Mar 26, 2026
da73155
fix: simplify
jakubno Mar 26, 2026
6fdbb64
chore: remove from state if sandbox not found
jakubno Mar 27, 2026
2ca286a
fix: return correct error
jakubno Mar 27, 2026
b55cafa
fix: tests
jakubno Mar 27, 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
5 changes: 3 additions & 2 deletions packages/api/internal/orchestrator/delete_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,16 @@ func (o *Orchestrator) RemoveSandbox(ctx context.Context, teamID uuid.UUID, sand
return nil
}

defer func() { go o.analyticsRemove(context.WithoutCancel(ctx), sbx, opts.Action) }()
defer o.sandboxStore.Remove(ctx, teamID, sandboxID)
err = o.removeSandboxFromNode(ctx, sbx, opts.Action)
if err != nil {
logger.L().Error(ctx, "Error pausing sandbox", zap.Error(err), logger.WithSandboxID(sbx.SandboxID))

return ErrSandboxOperationFailed
}

o.sandboxStore.Remove(context.WithoutCancel(ctx), teamID, sandboxID)
func() { go o.analyticsRemove(context.WithoutCancel(ctx), sbx, opts.Action) }()

return nil
}

Expand Down
Loading