Pass context to WaitReady of alertmanager Peer interface. #3931
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
pracucci
reviewed
Mar 9, 2021
There was a problem hiding this comment.
LGTM. Waiting for prometheus/alertmanager#2509 to get merged before marking this PR with an official approval. I've asked @gouthamve to review prometheus/alertmanager#2509.
pstibrany
reviewed
Mar 9, 2021
| @@ -584,8 +584,13 @@ func (p *Peer) Ready() bool { | |||
| } | |||
|
|
|||
| // Wait until Settle() has finished. | |||
There was a problem hiding this comment.
Shouldn’t WaitReady return error, so that client knows whether peer is now ready or not? WDYT?
stevesg
force-pushed
the
am-wait-context
branch
from
883a71f
to
e620254
Compare
pracucci
reviewed
Mar 10, 2021
pkg/alertmanager/alertmanager.go
Outdated
| @@ -110,7 +110,7 @@ func init() { | |||
| type State interface { | |||
| AddState(string, cluster.State, prometheus.Registerer) cluster.ClusterChannel | |||
| Position() int | |||
| WaitReady() | |||
| WaitReady(context.Context) | |||
There was a problem hiding this comment.
Suggested change
| WaitReady(context.Context) | |
| WaitReady(context.Context) error |
stevesg
force-pushed
the
am-wait-context
branch
from
e620254
to
4cf1ead
Compare
stevesg
force-pushed
the
am-wait-context
branch
from
4cf1ead
to
8769704
Compare
|
Rebase |
Signed-off-by: Steve Simpson <steve.simpson@grafana.com>
Signed-off-by: Steve Simpson <steve.simpson@grafana.com>
stevesg
force-pushed
the
am-wait-context
branch
from
8769704
to
9d318af
Compare
|
Fixed mod-check |
roystchiang
pushed a commit
to roystchiang/cortex
that referenced
this pull request
Apr 6, 2022
…ect#3931) * Update alertmanager. Signed-off-by: Steve Simpson <steve.simpson@grafana.com> * Pass context to WaitReady of alertmanager Peer interface. Signed-off-by: Steve Simpson <steve.simpson@grafana.com>
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:
Pass context to WaitReady of alertmanager Peer interface.
Original discussion:
#3839 (comment)
Depends on: prometheus/alertmanager#2509
Checklist
- [X] Tests updated- [X] Documentation added- [X]CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]