fix a flaky test in boltdb shipper #2550
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
Codecov Report
@@ Coverage Diff @@
## master #2550 +/- ##
==========================================
- Coverage 63.46% 63.37% -0.10%
==========================================
Files 166 166
Lines 14582 14584 +2
==========================================
- Hits 9254 9242 -12
- Misses 4586 4601 +15
+ Partials 742 741 -1
|
owen-d
reviewed
Aug 25, 2020
| @@ -379,3 +377,10 @@ func loadBoltDBsFromDir(dir string) (map[string]*bbolt.DB, error) { | |||
|
|
|||
| return dbs, nil | |||
| } | |||
|
|
|||
| // getOldestActiveShardTime returns the time of oldest active shard with a buffer of 1 minute. | |||
| func getOldestActiveShardTime() time.Time { | |||
There was a problem hiding this comment.
Admittedly I'm not that familiar with this code, but I'm having a bit of difficulty following. Wouldn't it make more sense as func getOldestActiveShardTime(from time.Time) time.Time, which could then be passed time.Now() as an argument?
There was a problem hiding this comment.
We actually always have 1 active shard at a time but we consider last active shard as still active if it was active a minute back. This is to avoid any race conditions. I don't mind changing the function to accept a time.Time as a parameter but it would always be getting time.Now as input. Do you want me to change it?
owen-d
approved these changes
Aug 25, 2020
cyriltovena
pushed a commit
to cyriltovena/loki
that referenced
this pull request
Jun 11, 2021
* add Redis cache flags used by redigo: idle-timeout, wait, max-conn-lifetime Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com> * update CHANGELOG.md Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com> * apply check-doc comments Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com> * remove white-noise Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.com> * rename the Redis flag: wait -> wait-on-pool-exhaustion Signed-off-by: Kyeongwon Seo <ruddnjs1230@gmail.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 / why we need it:
The test
TestTable_ImmutableUploadswas flaky and was failing based on when tests are running.This PR fixes the tests by making the time calculation for oldest active shard time uniform between the actual code and the test by moving it to a function.
Checklist