Skip to content
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

cmd/contour: Enable retry for shutdown-manager initiating Envoy healthcheck fail #3136

Merged
merged 4 commits into from
Dec 1, 2020
Merged

cmd/contour: Enable retry for shutdown-manager initiating Envoy healthcheck fail #3136

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbe9deb
cmd/contour: Enable retry for shutdown-manager initiating Envoy healt…
stevesloka Nov 17, 2020
477be23
Merge branch 'main' into retryShutdown
stevesloka Nov 18, 2020
5ac9597
Merge branch 'main' into retryShutdown
stevesloka Nov 30, 2020
7cadd51
Merge branch 'main' into retryShutdown
stevesloka Dec 1, 2020
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
24 changes: 22 additions & 2 deletions cmd/contour/shutdownmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import (
"github.com/prometheus/common/expfmt"
"github.com/sirupsen/logrus"
"gopkg.in/alecthomas/kingpin.v2"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
)

const (
Expand Down Expand Up @@ -139,8 +141,26 @@ func (s *shutdownContext) shutdownHandler() {

// Send shutdown signal to Envoy to start draining connections
s.Infof("failing envoy healthchecks")
if err := shutdownEnvoy(); err != nil {
s.WithField("context", "shutdownHandler").Errorf("error sending envoy healthcheck fail: %v", err)

// Retry any failures to shutdownEnvoy() in a Backoff time window
// doing 4 total attempts, multiplying the Duration by the Factor
// for each iteration.
err := retry.OnError(wait.Backoff{
Steps: 4,
Duration: 200 * time.Millisecond,
Factor: 5.0,
Jitter: 0.1,
}, func(err error) bool {
// Always retry any error.
return true
}, func() error {
s.Infof("attempting to shutdown")
return shutdownEnvoy()
})
if err != nil {
// May be conflict if max retries were hit, or may be something unrelated
// like permissions or a network error
s.WithField("context", "shutdownHandler").Errorf("error sending envoy healthcheck fail after 4 attempts: %v", err)
}

s.WithField("context", "shutdownHandler").Infof("waiting %s before polling for draining connections", s.checkDelay)
Expand Down