Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix store: handle invalid cache block dir #1505

Merged
merged 2 commits into from
Sep 15, 2019
Merged

fix store: handle invalid cache block dir #1505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c58038a
fix store: handle invalid cache block dir
FUSAKLA Sep 13, 2019
f55b5d0
CR: simplify empty store cache block validation logic
FUSAKLA Sep 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ We use *breaking* word for marking changes that are not backward compatible (rel

## Unreleased

### Fixed

-[1505](https://github.com/thanos-io/thanos/pull/1505) Thanos store now removes invalid local cache blocks.

## v0.7.0 - 2019.09.02

Accepted into CNCF:
Expand Down
7 changes: 7 additions & 0 deletions pkg/block/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,10 @@ func IsBlockDir(path string) (id ulid.ULID, ok bool) {
id, err := ulid.Parse(filepath.Base(path))
return id, err == nil
}

func HasMetaFile(blockPath string) bool {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am against this shallow function - such helper is not needed - the oneliner below is exactly enough for this.

In the same way, there is no Max(a, b) function is go standard library. You just do this one if on your own (:
What do you think, can we just inline this logic?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could do what @bwplotka suggests, it might be neater. 👍

Copy link
Member Author

@FUSAKLA FUSAKLA Sep 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I eventually simplified it to checking directly for the meta file which should also provide the check for the directory existence right away. The creation of dir is agnostic to it's existence and new downloaded files should overwrite those existing in the block dir.

Thanks @bwplotka for pointing this out I just saw the IsBlockDir func so I somehow followed the pattern.

PTAL if this is ok with you.

if _, err := os.Stat(path.Join(blockPath, MetaFilename)); os.IsNotExist(err) {
return false
}
return true
}
4 changes: 2 additions & 2 deletions pkg/store/bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,8 +1188,8 @@ func (b *bucketBlock) indexCacheFilename() string {
}

func loadMeta(ctx context.Context, logger log.Logger, bucket objstore.BucketReader, dir string, id ulid.ULID) (error, *metadata.Meta) {
// If we haven't seen the block before download the meta.json file.
if _, err := os.Stat(dir); os.IsNotExist(err) {
// If we haven't seen the block before or it is missing the meta.json, download it.
if _, err := os.Stat(dir); os.IsNotExist(err) || (err == nil && !block.HasMetaFile(dir)) {
if err := os.MkdirAll(dir, 0777); err != nil {
return errors.Wrap(err, "create dir"), nil
}
Expand Down