baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Wrr loadbalancer honors old weight on recovered servers

Browse source
This commit is contained in:
Douglas Wagner 2019-08-07 08:14:04 -07:00 • committed by Traefiker Bot
parent 9299c3abc7
commit ffd8e5667c
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkg/healthcheck/healthcheck.go
View file

@ -56,11 +56,16 @@ func (opt Options) String() string {
return fmt.Sprintf("[Hostname: %s Headers: %v Path: %s Port: %d Interval: %s Timeout: %s]", opt.Hostname, opt.Headers, opt.Path, opt.Port, opt.Interval, opt.Timeout) return fmt.Sprintf("[Hostname: %s Headers: %v Path: %s Port: %d Interval: %s Timeout: %s]", opt.Hostname, opt.Headers, opt.Path, opt.Port, opt.Interval, opt.Timeout)
} }
type backendURL struct {
url *url.URL
weight int
}
// BackendConfig HealthCheck configuration for a backend // BackendConfig HealthCheck configuration for a backend
type BackendConfig struct { type BackendConfig struct {
Options Options
name string name string
disabledURLs []*url.URL disabledURLs []backendURL
} }
func (b *BackendConfig) newRequest(serverURL *url.URL) (*http.Request, error) { func (b *BackendConfig) newRequest(serverURL *url.URL) (*http.Request, error) {
@ -135,21 +140,22 @@ func (hc *HealthCheck) execute(ctx context.Context, backend *BackendConfig) {
func (hc *HealthCheck) checkBackend(backend *BackendConfig) { func (hc *HealthCheck) checkBackend(backend *BackendConfig) {
enabledURLs := backend.LB.Servers() enabledURLs := backend.LB.Servers()
var newDisabledURLs []*url.URL var newDisabledURLs []backendURL
// FIXME re enable metrics // FIXME re enable metrics
for _, disableURL := range backend.disabledURLs { for _, disableURL := range backend.disabledURLs {
// FIXME serverUpMetricValue := float64(0) // FIXME serverUpMetricValue := float64(0)
if err := checkHealth(disableURL, backend); err == nil { if err := checkHealth(disableURL.url, backend); err == nil {
log.Warnf("Health check up: Returning to server list. Backend: %q URL: %q", backend.name, disableURL.String()) log.Warnf("Health check up: Returning to server list. Backend: %q URL: %q Weight: %d",
if err = backend.LB.UpsertServer(disableURL, roundrobin.Weight(1)); err != nil { backend.name, disableURL.url.String(), disableURL.weight)
if err = backend.LB.UpsertServer(disableURL.url, roundrobin.Weight(disableURL.weight)); err != nil {
log.Error(err) log.Error(err)
} }
// FIXME serverUpMetricValue = 1 // FIXME serverUpMetricValue = 1
} else { } else {
log.Warnf("Health check still failing. Backend: %q URL: %q Reason: %s", backend.name, disableURL.String(), err) log.Warnf("Health check still failing. Backend: %q URL: %q Reason: %s", backend.name, disableURL.url.String(), err)
newDisabledURLs = append(newDisabledURLs, disableURL) newDisabledURLs = append(newDisabledURLs, disableURL)
} }
// FIXME labelValues := []string{"backend", backend.name, "url", disableURL.String()} // FIXME labelValues := []string{"backend", backend.name, "url", backendurl.url.String()}
// FIXME hc.metrics.BackendServerUpGauge().With(labelValues...).Set(serverUpMetricValue) // FIXME hc.metrics.BackendServerUpGauge().With(labelValues...).Set(serverUpMetricValue)
} }
backend.disabledURLs = newDisabledURLs backend.disabledURLs = newDisabledURLs
@ -158,11 +164,20 @@ func (hc *HealthCheck) checkBackend(backend *BackendConfig) {
for _, enableURL := range enabledURLs { for _, enableURL := range enabledURLs {
// FIXME serverUpMetricValue := float64(1) // FIXME serverUpMetricValue := float64(1)
if err := checkHealth(enableURL, backend); err != nil { if err := checkHealth(enableURL, backend); err != nil {
log.Warnf("Health check failed: Remove from server list. Backend: %q URL: %q Reason: %s", backend.name, enableURL.String(), err) weight := 1
rr, ok := backend.LB.(*roundrobin.RoundRobin)
if ok {
var gotWeight bool
weight, gotWeight = rr.ServerWeight(enableURL)
if !gotWeight {
weight = 1
}
}
log.Warnf("Health check failed: Remove from server list. Backend: %q URL: %q Weight: %d Reason: %s", backend.name, enableURL.String(), weight, err)
if err := backend.LB.RemoveServer(enableURL); err != nil { if err := backend.LB.RemoveServer(enableURL); err != nil {
log.Error(err) log.Error(err)
} }
backend.disabledURLs = append(backend.disabledURLs, enableURL) backend.disabledURLs = append(backend.disabledURLs, backendURL{enableURL, weight})
// FIXME serverUpMetricValue = 0 // FIXME serverUpMetricValue = 0
} }
// FIXME labelValues := []string{"backend", backend.name, "url", enableURL.String()} // FIXME labelValues := []string{"backend", backend.name, "url", enableURL.String()}

2
pkg/healthcheck/healthcheck_test.go
View file

@ -115,7 +115,7 @@ func TestSetBackendsConfiguration(t *testing.T) {
if test.startHealthy { if test.startHealthy {
lb.servers = append(lb.servers, serverURL) lb.servers = append(lb.servers, serverURL)
} else { } else {
backend.disabledURLs = append(backend.disabledURLs, serverURL) backend.disabledURLs = append(backend.disabledURLs, backendURL{url: serverURL, weight: 1})
} }
collectingMetrics := testhelpers.NewCollectingHealthCheckMetrics() collectingMetrics := testhelpers.NewCollectingHealthCheckMetrics()