Add shutdown delay and e2e test #3395
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joe Elliott <number101010@gmail.com>
joe-elliott
requested review from
annanay25,
mdisibio,
mapno,
kvrhdn,
zalegrala,
electron0zero,
ie-pham and
stoewer
as code owners
electron0zero
approved these changes
Feb 14, 2024
zalegrala
reviewed
Feb 14, 2024
integration/e2e/e2e_test.go
Outdated
| // confirm the readiness flag is down | ||
| res, err := e2e.DoGet("http://" + tempo.Endpoint(3200) + "/ready") | ||
| require.NoError(t, err) | ||
| require.Equal(t, http.StatusServiceUnavailable, res.StatusCode) |
There was a problem hiding this comment.
Perhaps perform a query before and after to confirm the change in behavior.
There was a problem hiding this comment.
it's not apparent, but this line waits until /ready returns 200:
There was a problem hiding this comment.
added a comment to help clarify that the /ready point is confirmed to be up before we stop tempo
| t.Server.SetKeepAlivesEnabled(false) | ||
|
|
||
| if t.cfg.ShutdownDelay > 0 { | ||
| time.Sleep(t.cfg.ShutdownDelay) |
There was a problem hiding this comment.
Do we also want to sleep when there are no requests in flight?
There was a problem hiding this comment.
i'm concerned about the complexity about that change. this is a very simple one that will do nearly all of what we want with some config choices in k8s
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
zalegrala
approved these changes
Feb 15, 2024
kvrhdn
pushed a commit
to kvrhdn/tempo
that referenced
this pull request
Feb 26, 2024
* Add shutdown delay and e2e test Signed-off-by: Joe Elliott <number101010@gmail.com> * changelog Signed-off-by: Joe Elliott <number101010@gmail.com> * determinism + comment Signed-off-by: Joe Elliott <number101010@gmail.com> * .Stop in a different goroutine then .Start creates a race Signed-off-by: Joe Elliott <number101010@gmail.com> --------- Signed-off-by: Joe Elliott <number101010@gmail.com>
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does:
Adds a shutdown delay configurable parameter modeled after mimir:
grafana/mimir#3298
After receiving SIGTERM Tempo will drop its readiness handler and wait the configured seconds. In a k8s environment this will allow Tempo to cleanly roll its frontend without dropping queries.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]