Skip to content

fix(sandboxd): a required promoted claim is not sent to a warm peer at quota either #265

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 1 commit into from
Sep 28, 2026
Merged

fix(sandboxd): a required promoted claim is not sent to a warm peer at quota either #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sandboxd/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func (s *Server) handleClaim(w http.ResponseWriter, r *http.Request) {
}
sb, err = s.mgr.ClaimProvision(r.Context(), key, o)
}
if errors.Is(err, pool.ErrQuota) && s.placer != nil && !req.NoRedirect &&
if errors.Is(err, pool.ErrQuota) && s.placer != nil && !req.NoRedirect && !req.RequirePromoted &&
s.writeRedirect(w, s.placer.Candidates(key.Hash())) {
return
}
Expand Down
9 changes: 6 additions & 3 deletions sandboxd/server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1729,15 +1729,18 @@ func TestARequiredPromotedClaimIsNeverSentToAWarmPeer(t *testing.T) {
for _, tt := range []struct {
name string
require bool
provision error
wantStatus int
wantWarm bool
}{
{"a plain claim follows the warm peer", false, http.StatusOK, true},
{"a required promoted claim answers 404 rather than a warm peer", true, http.StatusNotFound, false},
{"a plain claim follows the warm peer", false, pool.ErrUnknownTemplate, http.StatusOK, true},
{"a required promoted claim answers 404 rather than a warm peer", true, pool.ErrUnknownTemplate, http.StatusNotFound, false},
{"a plain claim at quota follows the warm peer", false, pool.ErrQuota, http.StatusOK, true},
{"a required promoted claim at quota answers 429 rather than a warm peer", true, pool.ErrQuota, http.StatusTooManyRequests, false},
} {
t.Run(tt.name, func(t *testing.T) {
mgr := &fakeManager{claim: func(context.Context, types.PoolKey, time.Duration) (*types.Sandbox, error) {
return nil, pool.ErrUnknownTemplate
return nil, tt.provision
}}
srv := New("sekret", nil, "node-a:7777", mgr, &fakeDialer{}, &fakePlacer{addrs: []string{"warm:7777"}}, nil, nil, nil)
ts := httptest.NewServer(srv.Handler())
Expand Down
Loading