Ensure queries return correctly during rolling upgrades of stateful cluster with RF 3 and only 3 nodes. #2503
Conversation
This file contains hidden or 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
This is to teast out errors in the replication logic. Signed-off-by: Tom Wilkie <tom@grafana.com>
Signed-off-by: Tom Wilkie <tom@grafana.com>
…RF=3 and #ingesters=2. Signed-off-by: Tom Wilkie <tom@grafana.com>
gouthamve
approved these changes
Apr 22, 2020
Signed-off-by: Tom Wilkie <tom@grafana.com>
pracucci
approved these changes
Apr 22, 2020
There was a problem hiding this comment.
The ring changes LGTM. Due to the change in the distributor tests prepare() we need to also fix the tests TestDistributor_PushIngestionRateLimiter, TestDistributor_Push_LabelRemoval, TestDistributor_Push_ShouldGuaranteeShardingTokenConsistencyOverTheTime. I've also left a couple of comments in the code.
Signed-off-by: Tom Wilkie <tom@grafana.com>
Signed-off-by: Tom Wilkie <tom@grafana.com>
Signed-off-by: Tom Wilkie <tom@grafana.com>
Signed-off-by: Tom Wilkie <tom@grafana.com>
…eding when it shouldn't Signed-off-by: Tom Wilkie <tom@grafana.com>
jtlisi
approved these changes
Apr 22, 2020
Co-Authored-By: Jacob Lisi <jacob.t.lisi@gmail.com> Signed-off-by: Tom Wilkie <tom@grafana.com>
tomwilkie
force-pushed
the
rf-three-with-two-ingesters
branch
from
3eb03c0 to
2619f25
Compare
|
Does this fix #1290 ? |
gouthamve
pushed a commit
to gouthamve/cortex
that referenced
this pull request
Apr 23, 2020
…luster with RF 3 and only 3 nodes. (cortexproject#2503) * Use a real ring with mock KV when testing distributor. This is to teast out errors in the replication logic. Signed-off-by: Tom Wilkie <tom@grafana.com> * Extend distributor test to cover the case RF=3 with 2 ingesters. Signed-off-by: Tom Wilkie <tom@grafana.com> * Ensure ring correctly calculates the number of allowed failures when RF=3 and #ingesters=2. Signed-off-by: Tom Wilkie <tom@grafana.com> * Add changelog and review feedback. Signed-off-by: Tom Wilkie <tom@grafana.com> * Refactor some distributor tests to try and get them to pass. Signed-off-by: Tom Wilkie <tom@grafana.com> * Speed up tests but polling more frequently. Signed-off-by: Tom Wilkie <tom@grafana.com> * Fix same bug on the write path. Signed-off-by: Tom Wilkie <tom@grafana.com> * Tidy up the distributor tests. Signed-off-by: Tom Wilkie <tom@grafana.com> * Make test correctly handle RF3 and 2 ingesters - previously was succeeding when it shouldn't Signed-off-by: Tom Wilkie <tom@grafana.com> * Update pkg/ring/ring.go Co-Authored-By: Jacob Lisi <jacob.t.lisi@gmail.com> Signed-off-by: Tom Wilkie <tom@grafana.com> Co-authored-by: Jacob Lisi <jacob.t.lisi@gmail.com> Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
gouthamve
added a commit
that referenced
this pull request
Apr 23, 2020
…luster with RF 3 and only 3 nodes. (#2503) (#2512) * Use a real ring with mock KV when testing distributor. This is to teast out errors in the replication logic. Signed-off-by: Tom Wilkie <tom@grafana.com> * Extend distributor test to cover the case RF=3 with 2 ingesters. Signed-off-by: Tom Wilkie <tom@grafana.com> * Ensure ring correctly calculates the number of allowed failures when RF=3 and #ingesters=2. Signed-off-by: Tom Wilkie <tom@grafana.com> * Add changelog and review feedback. Signed-off-by: Tom Wilkie <tom@grafana.com> * Refactor some distributor tests to try and get them to pass. Signed-off-by: Tom Wilkie <tom@grafana.com> * Speed up tests but polling more frequently. Signed-off-by: Tom Wilkie <tom@grafana.com> * Fix same bug on the write path. Signed-off-by: Tom Wilkie <tom@grafana.com> * Tidy up the distributor tests. Signed-off-by: Tom Wilkie <tom@grafana.com> * Make test correctly handle RF3 and 2 ingesters - previously was succeeding when it shouldn't Signed-off-by: Tom Wilkie <tom@grafana.com> * Update pkg/ring/ring.go Co-Authored-By: Jacob Lisi <jacob.t.lisi@gmail.com> Signed-off-by: Tom Wilkie <tom@grafana.com> Co-authored-by: Jacob Lisi <jacob.t.lisi@gmail.com> Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com> Co-authored-by: Tom Wilkie <tomwilkie@users.noreply.github.com> Co-authored-by: Jacob Lisi <jacob.t.lisi@gmail.com>
|
I can't see that this fixes #1290. AFAICS |
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.
Signed-off-by: Tom Wilkie tom@grafana.com
What this PR does:
Which issue(s) this PR fixes:
Fixes #2504
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]