fix calculation of expected tables and create tables from upcoming schema considering grace period #1976
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
pracucci
approved these changes
Jan 17, 2020
| @@ -239,7 +239,8 @@ func (m *TableManager) calculateExpectedTables() []TableDesc { | |||
| result := []TableDesc{} | |||
|
|
|||
| for i, config := range m.schemaCfg.Configs { | |||
| if config.From.Time.Time().After(mtime.Now()) { | |||
| // Consider configs which we are about to hit and requires tables to be created due to grace period | |||
| if config.From.Time.Time().After(mtime.Now().Add(m.cfg.CreationGracePeriod)) { | |||
There was a problem hiding this comment.
Note to myself: this looks a safe change to me. We're going to create the new table a bit ahead of time, which is what we want.
bboreham
approved these changes
Jan 22, 2020
pkg/chunk/schema_config.go
Outdated
| @@ -424,8 +424,8 @@ func (cfg *PeriodicTableConfig) periodicTables(from, through model.Time, pCfg Pr | |||
| nowWeek = now / periodSecs | |||
| result = []TableDesc{} | |||
| ) | |||
| // If through ends on 00:00 of the day, don't include the upcoming day | |||
| if through.Unix()%secondsInDay == 0 { | |||
| // Make sure we don't have an extra table | |||
There was a problem hiding this comment.
I think this comment is now less explanatory. Could say something like “If interval ends exactly on a period boundary, don’t include the upcoming period”.
…hema considering grace period Signed-off-by: Sandeep Sukhani <[email protected]>
Signed-off-by: Sandeep Sukhani <[email protected]>
Signed-off-by: Sandeep Sukhani <[email protected]>
sandeepsukhani
force-pushed
the
fix_table_retention
branch
from
0ec33b4 to
b5f271e
Compare
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 includes following to fixes:
Fix calculation of expected tables:
While calculating periodic tables for a given duration, the end time of the duration was used to find what the last table number would be. To avoid creating an extra table, there was a check whether end duration was ending exactly at end of the day which was causing the whole table to be omitted. Instead of checking against a days duration, this PR uses periodic table duration to check whether we have an extra table.
Create tables from upcoming schema considering grace period:
We skip creating tables for configs whose start time is after
now()which means tables would not be created until we already are past the start time of config. This can cause writes to fail since tables won't be created already for writing data to it.This PR checks whether the config start time is before
now() + gracePeriodwhen creating tables.Which issue(s) this PR fixes:
Fixes: #1920
In #1920, the start time of config was not set to the day when tables would rotate. When the time was just short by grace period before hitting next config, this block started calculating tables for duration from
start-of-active-schematostart-of-next-schema. Since the end was not a multiple of table duration but was a multiple of a days duration, issue 1 above was causing table manager to unexpectedly drop the active table.Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]