Skip to content

retain pre-existing hc target status on config reload #919

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
jranson merged 1 commit into from
Feb 21, 2026
Merged

retain pre-existing hc target status on config reload #919

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
10 changes: 8 additions & 2 deletions pkg/backends/backends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ import (
type Backends map[string]Backend

// StartHealthChecks iterates the backends to fully configure health checkers
// and start up any intervaled health checks
func (b Backends) StartHealthChecks() (healthcheck.HealthChecker, error) {
// and start up any intervaled health checks. knownStatuses is optional and
// sets the initial status of the provided targets (e.g., after a config reload)
func (b Backends) StartHealthChecks(knownStatuses healthcheck.StatusLookup) (healthcheck.HealthChecker, error) {
hc := healthcheck.New()
for k, c := range b {
bo := c.Configuration()
Expand All @@ -51,6 +52,11 @@ func (b Backends) StartHealthChecks() (healthcheck.HealthChecker, error) {
if err != nil {
return nil, err
}
if oldSt, ok := knownStatuses[k]; ok {
if v := oldSt.Get(); v != healthcheck.StatusInitializing {
st.Set(v)
}
}
c.SetHealthCheckProbe(st.Prober())
}
return hc, nil
Expand Down
10 changes: 5 additions & 5 deletions pkg/backends/backends_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,34 +81,34 @@ func TestStartHealthChecks(t *testing.T) {
c2, _ := New("test2", o2, nil, lm.NewRouter(), nil)

b := Backends{"test1": c1}
_, err := b.StartHealthChecks()
_, err := b.StartHealthChecks(nil)
if err != nil {
t.Error(err)
}

b = Backends{"test1": c1, "test2": c2}
_, err = b.StartHealthChecks()
_, err = b.StartHealthChecks(nil)
if err != nil {
t.Error(err)
}

o2.HealthCheck = nil
b = Backends{"test1": c1, "test2": c2}
_, err = b.StartHealthChecks()
_, err = b.StartHealthChecks(nil)
if err != nil {
t.Error(err)
}

o2.HealthCheck = ho.New()
b = Backends{"test1": c1, "test2": c2}
_, err = b.StartHealthChecks()
_, err = b.StartHealthChecks(nil)
if err != nil {
t.Error(err)
}

c2a := &testBackend{Backend: c2}
b = Backends{"test1": c1, "test2": c2a}
_, err = b.StartHealthChecks()
_, err = b.StartHealthChecks(nil)
if err != nil {
t.Error(err)
}
Expand Down
7 changes: 6 additions & 1 deletion pkg/daemon/setup/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/trickstercache/trickster/v2/pkg/appinfo/usage"
"github.com/trickstercache/trickster/v2/pkg/backends"
"github.com/trickstercache/trickster/v2/pkg/backends/alb"
"github.com/trickstercache/trickster/v2/pkg/backends/healthcheck"
"github.com/trickstercache/trickster/v2/pkg/cache"
"github.com/trickstercache/trickster/v2/pkg/cache/index"
"github.com/trickstercache/trickster/v2/pkg/cache/manager"
Expand Down Expand Up @@ -199,7 +200,11 @@ func ApplyConfig(si *instance.ServerInstance, newConf *config.Config,
if si.HealthChecker != nil {
si.HealthChecker.Shutdown()
}
si.HealthChecker, err = clients.StartHealthChecks()
var oldStatuses healthcheck.StatusLookup
if si.HealthChecker != nil {
oldStatuses = si.HealthChecker.Statuses()
}
si.HealthChecker, err = clients.StartHealthChecks(oldStatuses)
if err != nil {
return err
}
Expand Down
Loading