Define bucket index struct #3553
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
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
pstibrany
approved these changes
Dec 1, 2020
| // in the block, if they match a known pattern. We don't store the full segments | ||
| // files list in order to keep the index small. SegmentsFormat is empty if segments | ||
| // are unknown or don't match a known format. | ||
| SegmentsFormat string `json:"segments_format"` |
There was a problem hiding this comment.
I'd suggest to omit empty segments_format and segments_num fields.
| IndexVersion1 = 1 | ||
|
|
||
| SegmentsFormatUnknown = "" | ||
| SegmentsFormat1Based6Digits = "1b6d" |
There was a problem hiding this comment.
Can we add a comment on what this format is? This looks quite cryptic without explanation.
| func (m *Block) thanosMetaSegmentFiles() (files []string) { | ||
| if m.SegmentsFormat == SegmentsFormat1Based6Digits { | ||
| for i := 1; i <= m.SegmentsNum; i++ { | ||
| files = append(files, fmt.Sprintf("%06d", i)) |
There was a problem hiding this comment.
Nice trick with named return value initialized to nil.
pracucci
commented
Dec 1, 2020
| Blocks []*Block `json:"blocks"` | ||
|
|
||
| // List of block deletion marks. | ||
| BlockDeletionMarks []*BlockDeletionMark `json:"block_deletion_marks"` |
There was a problem hiding this comment.
I explicitly called it "Block deletion mark" to avoid misunderstandings with other deletion marks we may have in the system (eg. "Tenant deletion mark").
| @@ -68,7 +68,7 @@ type BlocksFinder interface { | |||
|
|
|||
| // GetBlocks returns known blocks for userID containing samples within the range minT | |||
| // and maxT (milliseconds, both included). Returned blocks are sorted by MaxTime descending. | |||
| GetBlocks(userID string, minT, maxT int64) ([]*BlockMeta, map[ulid.ULID]*metadata.DeletionMark, error) | |||
| GetBlocks(ctx context.Context, userID string, minT, maxT int64) (bucketindex.Blocks, map[ulid.ULID]*bucketindex.BlockDeletionMark, error) | |||
There was a problem hiding this comment.
I've introduced context.Context, even if not used yet, as preliminary step for a follow-up PR.
| @@ -170,7 +170,6 @@ func NewBlocksStoreQueryableFromConfig(querierCfg Config, gatewayCfg storegatewa | |||
| TenantsConcurrency: storageCfg.BucketStore.TenantSyncConcurrency, | |||
| MetasConcurrency: storageCfg.BucketStore.MetaSyncConcurrency, | |||
| CacheDir: storageCfg.BucketStore.SyncDir, | |||
| ConsistencyDelay: storageCfg.BucketStore.ConsistencyDelay, | |||
There was a problem hiding this comment.
Was unused. Removed it.
Signed-off-by: Marco Pracucci <marco@pracucci.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 is the first PR to introduce the bucket index, as described in this design doc. In this PR I'm just defining the structs and using them in the querier. The logic hasn't changed (unless bugs).
I've also upgraded Thanos (minor changes) as preliminary step for a follow-up PR.
Which issue(s) this PR fixes:
N/A
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]