Store Gateway: Add experimental configuration to use MAP_POPULATE for indexheader reads. #2019
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
| // Provenance-includes-location: https://github.com/prometheus/prometheus/blob/main/tsdb/fileutil/mmap.go | ||
| // Provenance-includes-license: Apache-2.0 | ||
| // Provenance-includes-copyright: The Prometheus Authors. | ||
|
|
||
| package fileutil | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| type MmapFile struct { | ||
| f *os.File | ||
| b []byte | ||
| } | ||
|
|
||
| func OpenMmapFile(path string, populate bool) (*MmapFile, error) { | ||
|
Contributor
There was a problem hiding this comment. as far as I understand this file is basically copied from Prometheus and then modified, right?
Contributor
There was a problem hiding this comment. or if we don't want to upstream into upstream prometheus, we could still consider making the change in
Contributor
Author
There was a problem hiding this comment. Given the size of the files, I don't think it's worth the effort doing either right now. If the testing goes well, then I'll upstream the changes. |
||
| return OpenMmapFileWithSize(path, 0, populate) | ||
| } | ||
|
|
||
| func OpenMmapFileWithSize(path string, size int, populate bool) (mf *MmapFile, retErr error) { | ||
| f, err := os.Open(path) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "try lock file") | ||
| } | ||
| defer func() { | ||
| if retErr != nil { | ||
| f.Close() | ||
| } | ||
| }() | ||
| if size <= 0 { | ||
| info, err := f.Stat() | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "stat") | ||
| } | ||
| size = int(info.Size()) | ||
| } | ||
|
|
||
| b, err := mmap(f, size, populate) | ||
| if err != nil { | ||
| return nil, errors.Wrapf(err, "mmap, size %d", size) | ||
| } | ||
|
|
||
| return &MmapFile{f: f, b: b}, nil | ||
| } | ||
|
|
||
| func (f *MmapFile) Close() error { | ||
| err0 := munmap(f.b) | ||
| err1 := f.f.Close() | ||
|
|
||
| if err0 != nil { | ||
| return err0 | ||
| } | ||
| return err1 | ||
| } | ||
|
|
||
| func (f *MmapFile) File() *os.File { | ||
| return f.f | ||
| } | ||
|
|
||
| func (f *MmapFile) Bytes() []byte { | ||
| return f.b | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // SPDX-License-Identifier: AGPL-3.0-only | ||
| // Provenance-includes-location: https://github.com/prometheus/prometheus/blob/main/tsdb/fileutil/mmap_unix.go | ||
| // Provenance-includes-license: Apache-2.0 | ||
| // Provenance-includes-copyright: The Prometheus Authors. | ||
|
|
||
| //go:build !windows && !plan9 | ||
| // +build !windows,!plan9 | ||
|
|
||
| package fileutil | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| "golang.org/x/sys/unix" | ||
| ) | ||
|
|
||
| func mmap(f *os.File, length int, populate bool) ([]byte, error) { | ||
| flags := unix.MAP_SHARED | ||
| if populate { | ||
| flags |= unix.MAP_POPULATE | ||
| } | ||
| return unix.Mmap(int(f.Fd()), 0, length, unix.PROT_READ, flags) | ||
| } | ||
|
|
||
| func munmap(b []byte) (err error) { | ||
| return unix.Munmap(b) | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should move
index_header_lazy_loading_enabledtoindex_headersection at some point, if this experiment survives.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To avoid introducing a breaking change, I would rather do the opposite and use YAML inline for the new index header config struct in the bucket stores config. This would allow us to have a dedicated struct for index header config in the code, but not having to move existing stable flags.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm working on a PR that will touch this area of the code, #2048. I can open a PR to implement this change and update relevant internal (Grafana) configuration.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually nevermind, I'll leave it as is for now and wait to see if our various experiments with index header changes survive.