Runtime-config: Handle absolute file paths when working directory is not / #6224
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
CharlieTLe
changed the title
CharlieTLe
force-pushed
the
fix-default-root-path-for-runtime-config
branch
from
a6e1d16 to
93a1668
Compare
We started using a BucketClient for the filesystem where the default directory is an empty string: https://github.com/cortexproject/cortex/blob/af9e20c54ee97f409008f3e86541c5dfa5038e22/pkg/storage/bucket/filesystem/config.go#L17 When we create the new bucket, https://github.com/cortexproject/cortex/blob/526a6d935a948119cf74033a9f79391786022222/vendor/github.com/thanos-io/objstore/providers/filesystem/filesystem.go#L46 uses `filepath.Abs("")` which will use the current working directory as the root directory. Fixes: #6219 Signed-off-by: Charlie Le <[email protected]>
CharlieTLe
force-pushed
the
fix-default-root-path-for-runtime-config
branch
from
93a1668 to
6dbccee
Compare
CharlieTLe
changed the title
yeya24
reviewed
Sep 21, 2024
Allows for testing what happens when cortex is run from a directory that is not the root directory. Signed-off-by: Charlie Le <[email protected]>
CharlieTLe
changed the title
Signed-off-by: Charlie Le <[email protected]>
CharlieTLe
force-pushed
the
fix-default-root-path-for-runtime-config
branch
from
ff343f6 to
ebd158f
Compare
|
@CharlieTLe Sorry for the late review, can we fix changelog? |
Signed-off-by: Charlie Le <[email protected]>
|
@yeya24 Updated |
Signed-off-by: Charlie Le <[email protected]>
yeya24
approved these changes
Sep 26, 2024
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.
We started using a BucketClient for the filesystem where the default directory is an empty string:
cortex/pkg/storage/bucket/filesystem/config.go
Line 17 in af9e20c
When we create the new bucket,
cortex/vendor/github.com/thanos-io/objstore/providers/filesystem/filesystem.go
Line 46 in 526a6d9
filepath.Abs("")which will use the current working directory as the root directory.What this PR does:
Handles absolute file paths for the runtime config file when using the filesystem and the working directory is not /.
Which issue(s) this PR fixes:
Fixes: #6219
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]