Don't update lastUpdateTime if TSDB isn't updated. #3727
Merged
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
ranton256
approved these changes
Jan 21, 2021
pracucci
approved these changes
Jan 22, 2021
| db.setLastUpdate(time.Now()) | ||
| // If only invalid samples are pushed, don't change "last update", as TSDB was not modified. | ||
| if succeededSamplesCount > 0 { | ||
| db.setLastUpdate(time.Now()) |
There was a problem hiding this comment.
We can avoid time.Now() using startCommit.
Suggested change
| db.setLastUpdate(time.Now()) | |
| db.setLastUpdate(startCommit) |
There was a problem hiding this comment.
I don't think we need to avoid time.Now() here. Furthermore there are cases where commit takes quite a while. We only have bucket up to 10 seconds, but metrics show that we hit it regularly on some ingesters (!), although in practice that should still be good enough.
| lastUpdate := db.lastUpdate.Load() | ||
|
|
||
| // Wait until 1 second passes. | ||
| test.Poll(t, 1*time.Second, time.Now().Unix()+1, func() interface{} { |
There was a problem hiding this comment.
Why not time.Sleep(time.Second)?
There was a problem hiding this comment.
test.Poll allows us to wait shorter.
pracucci
reviewed
Jan 22, 2021
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@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: This PR modified ingester to not update "lastUpdate" time if push request didn't contain any sample that was appended to TSDB.
Without doing this change, continuous push of bad samples will keep TSDB in memory with unflushed data. If "good" sample arrives much later, all old data will be finally put to block.
With this change, ingester will eventually flush and close such TSDB, and remove local data. After closing, next push of valid or invalid sample will reopen TSDB again (and then later close, if no valid samples arrive), but at least old samples will not be kept in the memory for a long time.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]