Allow using different listing strategies #7134
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
fpetkovski
force-pushed
the
recursive-fetcher
branch
from
7cc4098
to
eaa68b7
Compare
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
fpetkovski
force-pushed
the
recursive-fetcher
branch
from
eaa68b7
to
d5168cf
Compare
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
fpetkovski
force-pushed
the
recursive-fetcher
branch
from
f424929
to
a972f17
Compare
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
mfoldenyi
reviewed
Feb 15, 2024
docs/components/compact.md
Outdated
| @@ -279,6 +279,15 @@ usage: thanos compact [<flags>] | |||
| Continuously compacts blocks in an object store bucket. | |||
|
|
|||
| Flags: | |||
| --block-discovery-strategy="concurrent" | |||
| One ofconcurrent, recursive. When set to | |||
There was a problem hiding this comment.
Good catch, thanks 👍
mfoldenyi
reviewed
Feb 15, 2024
cmd/thanos/store.go
Outdated
| @@ -137,6 +146,10 @@ func (sc *storeConfig) registerFlag(cmd extkingpin.FlagClause) { | |||
| cmd.Flag("sync-block-duration", "Repeat interval for syncing the blocks between local and remote view."). | |||
| Default("15m").DurationVar(&sc.syncInterval) | |||
|
|
|||
| strategies := strings.Join([]string{string(concurrentDiscovery), string(recursiveDiscovery)}, ", ") | |||
| cmd.Flag("block-discovery-strategy", "One of"+strategies+". When set to concurrent, stores will concurrently issue one call per directory to discover active blocks in the bucket. The recursive strategy iterates through all objects in the bucket, recursively traversing into each directory. This avoids N+1 calls at the expense of having slower bucket iterations."). | |||
There was a problem hiding this comment.
"One of "+strategies
instead of
"One of"+strategies
There was a problem hiding this comment.
Thanks, updated.
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
yeya24
reviewed
Feb 15, 2024
| @@ -754,6 +763,9 @@ func (cc *compactConfig) registerFlag(cmd extkingpin.FlagClause) { | |||
| "as querying long time ranges without non-downsampled data is not efficient and useful e.g it is not possible to render all samples for a human eye anyway"). | |||
| Default("false").BoolVar(&cc.disableDownsampling) | |||
|
|
|||
| strategies := strings.Join([]string{string(concurrentDiscovery), string(recursiveDiscovery)}, ", ") | |||
| cmd.Flag("block-discovery-strategy", "One of "+strategies+". When set to concurrent, stores will concurrently issue one call per directory to discover active blocks in the bucket. The recursive strategy iterates through all objects in the bucket, recursively traversing into each directory. This avoids N+1 calls at the expense of having slower bucket iterations."). | |||
There was a problem hiding this comment.
We revert the current behavior and change back to the old one? Is it worth a changelog?
There was a problem hiding this comment.
I am no authority on anything, but I would personally like to have a changelog entry on this. Seeing how it was mentioned in different threads how this is a blocker for upgrading Thanos itself for some, I think it is important enough.
There was a problem hiding this comment.
Good call. I added a changelog entry, let me know if that's sufficient or we should elaborate further.
fpetkovski
force-pushed
the
recursive-fetcher
branch
from
cfdf953
to
3f1805b
Compare
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
fpetkovski
force-pushed
the
recursive-fetcher
branch
from
3f1805b
to
a3e9672
Compare
mfoldenyi
approved these changes
Feb 24, 2024
yeya24
approved these changes
Feb 24, 2024
There was a problem hiding this comment.
Thanks. Merging now.
Thanks for helping with the review! @mfoldenyi
3 tasks
GiedriusS
pushed a commit
to vinted/thanos
that referenced
this pull request
Apr 4, 2024
* Allow using different listing strategies Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Expose flags for block list strategy Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Run make docs Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Fix whitespace Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Add CHANGELOG entry Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> --------- Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
GiedriusS
added a commit
to vinted/thanos
that referenced
this pull request
Apr 4, 2024
Allow using different listing strategies (thanos-io#7134)
jnyi
pushed a commit
to jnyi/thanos
that referenced
this pull request
Apr 4, 2024
* Allow using different listing strategies Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Expose flags for block list strategy Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Run make docs Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Fix whitespace Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> * Add CHANGELOG entry Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> --------- Signed-off-by: Filip Petkovski <filip.petkovsky@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.
In #6474 we changed the way blocks are discovered in object storage by replacing a top-level iteration + exist calls with a single recursive iteration. This method seems to be slow for some users who either have a large amount of objects in the bucket, or prefer faster boot times.
To resolve that problem, this PR exposes a flag allowing users to control the strategy used for discovering TSDB blocks. The default strategy will be one prior to #6474 since it has been there for a long time and has proven to work well for most casesl.
Changes
Verification