From 78a39ec011c1b2870629f0c70ca1a4398e849311 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Sun, 30 Aug 2026 13:55:01 +0300 Subject: [PATCH] fix: roll back release sets atomically --- cmd/supervisor/main.go | 15 ++++++++++++++- runtime/supervisor/supervisor.go | 3 +++ runtime/supervisor/supervisor_test.go | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/cmd/supervisor/main.go b/cmd/supervisor/main.go index 3daf981..3976f42 100644 --- a/cmd/supervisor/main.go +++ b/cmd/supervisor/main.go @@ -261,7 +261,20 @@ func (s *server) promoteTraffic(w http.ResponseWriter, _ *http.Request) { respond(w, ok, err) } func (s *server) rollbackTraffic(w http.ResponseWriter, _ *http.Request) { - ok, err := s.lifeboat.RollbackTraffic() + state, snapshotErr := s.lifeboat.Snapshot() + if snapshotErr != nil { + respond(w, false, snapshotErr) + return + } + // A ReleaseSet must roll back as a whole. The legacy release-only method + // would merely flip the traffic mode while retaining a candidate upstream. + var ok bool + var err error + if state.StableReleaseSet != nil { + ok, err = s.lifeboat.RollbackSet() + } else { + ok, err = s.lifeboat.RollbackTraffic() + } respond(w, ok, err) } diff --git a/runtime/supervisor/supervisor.go b/runtime/supervisor/supervisor.go index ae93a77..6e39ec4 100644 --- a/runtime/supervisor/supervisor.go +++ b/runtime/supervisor/supervisor.go @@ -210,6 +210,9 @@ func (l *Lifeboat) PromoteSet() bool { l.Current.Set = &set l.Current.LastKnownGood = true l.CandidateReleaseSet = nil + // The promoted ReleaseSet is now the stable target. Leaving header-canary + // mode active would keep an obsolete candidate route in the public proxy. + l.TrafficMode = TrafficStable return l.setSetUpstreams(&set, nil) } diff --git a/runtime/supervisor/supervisor_test.go b/runtime/supervisor/supervisor_test.go index 5e6683b..8a4019c 100644 --- a/runtime/supervisor/supervisor_test.go +++ b/runtime/supervisor/supervisor_test.go @@ -156,6 +156,9 @@ func TestReleaseSetPromotionRetainsPreviousStableForRollback(t *testing.T) { if !l.RecordSet(observation) || !l.PromoteSet() { t.Fatal("promotion failed") } + if l.TrafficMode != supervisor.TrafficStable { + t.Fatalf("promoted ReleaseSet traffic=%s, want stable", l.TrafficMode) + } if l.RollbackTargetReleaseSet == nil || l.RollbackTargetReleaseSet.Revision != "r1" { t.Fatalf("rollback target=%+v", l.RollbackTargetReleaseSet) }