chore: loadShards changes to more cleanly support 2.x feature#25513
Merged
gwossum merged 18 commits intomaster-1.xfrom Nov 8, 2024
Merged
chore: loadShards changes to more cleanly support 2.x feature#25513gwossum merged 18 commits intomaster-1.xfrom
gwossum merged 18 commits intomaster-1.xfrom
Conversation
Explicitly load series files and create indices serially. Also avoid passing them to work functions that don't need them.
…ore_BadShardLoading
davidby-influx
previously approved these changes
Nov 4, 2024
Contributor
davidby-influx
left a comment
There was a problem hiding this comment.
Non-blocking suggestions for a slight refactor.
Refactor loadShards and CreateShard to use a common shardLoader class that makes thread-safety easier. Refactor walkShardsAndProcess into findShards.
Rename Store.OpenShard to Store.ReopenShard and implement using a shardLoader object. Changes to tests as necessary.
Avoid resetting shard options when reopening a shard. Proper mutex locker in Shard.ReopenShard.
devanbenz
reviewed
Nov 8, 2024
| shard *Shard | ||
|
|
||
| // Should be loaded even if loading failed previously? | ||
| force bool |
devanbenz
reviewed
Nov 8, 2024
| loadErr error | ||
| } | ||
|
|
||
| // Load loads a shard from disk in a thread-safe manner. After a call to Load, |
devanbenz
previously approved these changes
Nov 8, 2024
devanbenz
left a comment
There was a problem hiding this comment.
LGTM I don't have any requested changes. Reading through the code I really like what you did though @gwossum. Especially how you pulled dependencies out of the lambda functions and "flattened" the code out more. It's very easy to read. Thank you!
davidby-influx
requested changes
Nov 8, 2024
Contributor
davidby-influx
left a comment
There was a problem hiding this comment.
One comment typo, one minor code simplification.
gwossum
added a commit
that referenced
this pull request
Nov 8, 2024
* chore: move shardID parsing and shard filtering into walkShardsAndProcess * chore: make it impossible to miss sending shardResponse or marking shard as complete * chore: always count number of shards (preparation for 2.x related feature) * chore: explicitly load series files and create indices serially Explicitly load series files and create indices serially. Also avoid passing them to work functions that don't need them. * chore: rework loadShards for changes necessary to cancel loading process * chore: comment improvements * fix: fix race conditions in TestStore_StartupShardProgress and TestStore_BadShardLoading * chore: avoid logging nil error * chore: refactor shard loading and shard walking Refactor loadShards and CreateShard to use a common shardLoader class that makes thread-safety easier. Refactor walkShardsAndProcess into findShards. * chore: improve comment * chore: rename OpenShard to ReopenShard and implement with shardLoader Rename Store.OpenShard to Store.ReopenShard and implement using a shardLoader object. Changes to tests as necessary. * chore: avoid resetting shard options and locking on Reopen Avoid resetting shard options when reopening a shard. Proper mutex locker in Shard.ReopenShard. * chore: fix formatting issue * chore: warn on mixed index types in Store.CreateShard * chore: change from info to warn when invalid shard IDs found in path * chore: use coarser locking in Store.ReopenShard * chore: fix typo in comment * chore: code simplification (cherry picked from commit 0bc167b)
gwossum
added a commit
that referenced
this pull request
Nov 12, 2024
* chore: loadShards changes to more cleanly support 2.x feature (#25513) * chore: move shardID parsing and shard filtering into walkShardsAndProcess * chore: make it impossible to miss sending shardResponse or marking shard as complete * chore: always count number of shards (preparation for 2.x related feature) * chore: explicitly load series files and create indices serially Explicitly load series files and create indices serially. Also avoid passing them to work functions that don't need them. * chore: rework loadShards for changes necessary to cancel loading process * chore: comment improvements * fix: fix race conditions in TestStore_StartupShardProgress and TestStore_BadShardLoading * chore: avoid logging nil error * chore: refactor shard loading and shard walking Refactor loadShards and CreateShard to use a common shardLoader class that makes thread-safety easier. Refactor walkShardsAndProcess into findShards. * chore: improve comment * chore: rename OpenShard to ReopenShard and implement with shardLoader Rename Store.OpenShard to Store.ReopenShard and implement using a shardLoader object. Changes to tests as necessary. * chore: avoid resetting shard options and locking on Reopen Avoid resetting shard options when reopening a shard. Proper mutex locker in Shard.ReopenShard. * chore: fix formatting issue * chore: warn on mixed index types in Store.CreateShard * chore: change from info to warn when invalid shard IDs found in path * chore: use coarser locking in Store.ReopenShard * chore: fix typo in comment * chore: code simplification (cherry picked from commit 0bc167b) * chore: fix logging issues in Store.loadShards Fix reporting shards not opening correctly when they actually did. Fix race condition with logging in loadShards. (cherry picked from commit 65683bf) * chore: remove unnecessary fmt.Sprintf calls Remove unnecessary fmt.Sprintf calls for static code checks in main-2.x. (cherry picked from commit 8497fbf) * chore: remove unnecessary blank identifier * chore: remove unnecessary blank identifier
gwossum
added a commit
that referenced
this pull request
Nov 15, 2024
* chore: loadShards changes to more cleanly support 2.x feature (#25513) * chore: move shardID parsing and shard filtering into walkShardsAndProcess * chore: make it impossible to miss sending shardResponse or marking shard as complete * chore: always count number of shards (preparation for 2.x related feature) * chore: explicitly load series files and create indices serially Explicitly load series files and create indices serially. Also avoid passing them to work functions that don't need them. * chore: rework loadShards for changes necessary to cancel loading process * chore: comment improvements * fix: fix race conditions in TestStore_StartupShardProgress and TestStore_BadShardLoading * chore: avoid logging nil error * chore: refactor shard loading and shard walking Refactor loadShards and CreateShard to use a common shardLoader class that makes thread-safety easier. Refactor walkShardsAndProcess into findShards. * chore: improve comment * chore: rename OpenShard to ReopenShard and implement with shardLoader Rename Store.OpenShard to Store.ReopenShard and implement using a shardLoader object. Changes to tests as necessary. * chore: avoid resetting shard options and locking on Reopen Avoid resetting shard options when reopening a shard. Proper mutex locker in Shard.ReopenShard. * chore: fix formatting issue * chore: warn on mixed index types in Store.CreateShard * chore: change from info to warn when invalid shard IDs found in path * chore: use coarser locking in Store.ReopenShard * chore: fix typo in comment * chore: code simplification (cherry picked from commit 0bc167b) * chore: fix logging issues in Store.loadShards Fix reporting shards not opening correctly when they actually did. Fix race condition with logging in loadShards. (cherry picked from commit 65683bf) * chore: remove unnecessary fmt.Sprintf calls Remove unnecessary fmt.Sprintf calls for static code checks in main-2.x. (cherry picked from commit 8497fbf) * chore: remove unnecessary blank identifier * chore: remove unnecessary blank identifier (cherry picked from commit 5c7479e) Closes: #25555
2 tasks
gwossum
added a commit
that referenced
this pull request
Nov 15, 2024
* chore: loadShards changes to more cleanly support 2.x feature (#25513) * chore: move shardID parsing and shard filtering into walkShardsAndProcess * chore: make it impossible to miss sending shardResponse or marking shard as complete * chore: always count number of shards (preparation for 2.x related feature) * chore: explicitly load series files and create indices serially Explicitly load series files and create indices serially. Also avoid passing them to work functions that don't need them. * chore: rework loadShards for changes necessary to cancel loading process * chore: comment improvements * fix: fix race conditions in TestStore_StartupShardProgress and TestStore_BadShardLoading * chore: avoid logging nil error * chore: refactor shard loading and shard walking Refactor loadShards and CreateShard to use a common shardLoader class that makes thread-safety easier. Refactor walkShardsAndProcess into findShards. * chore: improve comment * chore: rename OpenShard to ReopenShard and implement with shardLoader Rename Store.OpenShard to Store.ReopenShard and implement using a shardLoader object. Changes to tests as necessary. * chore: avoid resetting shard options and locking on Reopen Avoid resetting shard options when reopening a shard. Proper mutex locker in Shard.ReopenShard. * chore: fix formatting issue * chore: warn on mixed index types in Store.CreateShard * chore: change from info to warn when invalid shard IDs found in path * chore: use coarser locking in Store.ReopenShard * chore: fix typo in comment * chore: code simplification (cherry picked from commit 0bc167b) * chore: fix logging issues in Store.loadShards Fix reporting shards not opening correctly when they actually did. Fix race condition with logging in loadShards. (cherry picked from commit 65683bf) * chore: remove unnecessary fmt.Sprintf calls Remove unnecessary fmt.Sprintf calls for static code checks in main-2.x. (cherry picked from commit 8497fbf) * chore: remove unnecessary blank identifier * chore: remove unnecessary blank identifier (cherry picked from commit 5c7479e) Closes: #25555
2 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Changes to
loadShardsto support a 2.x feature without making it difficult to keep TSM code in sync. Also includes minor code quality improvements.