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

Jump to bottom

fix: make the tsdb filenames correctly reproducible from the identifier #12536

Merged
merged 2 commits into from
Apr 9, 2024
Merged

fix: make the tsdb filenames correctly reproducible from the identifier #12536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b75c9e
make the tsdb filenames correctly reproducible from the identifier
sandeepsukhani Apr 9, 2024
91f59a4
use a bool to turn on exporting creation timestamp in seconds
sandeepsukhani Apr 9, 2024
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
28 changes: 20 additions & 8 deletions pkg/storage/stores/shipper/indexshipper/tsdb/identifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,14 @@ func (p prefixedIdentifier) Name() string {
// Identifier has all the information needed to resolve a TSDB index
// Notably this abstracts away OS path separators, etc.
type SingleTenantTSDBIdentifier struct {
TS time.Time
From, Through model.Time
Checksum uint32
// exportTSInSecs tells whether creation timestamp should be exported in unix seconds instead of nanoseconds.
// timestamp in filename could be a unix second or a unix nanosecond so
// helps us to be able to reproduce filename back from parsed identifier.
// Should be true ideally for older files with creation timestamp in seconds.
exportTSInSecs bool
TS time.Time
From, Through model.Time
Checksum uint32
}

// implement Hash
Expand All @@ -77,9 +82,15 @@ func (i SingleTenantTSDBIdentifier) Hash(h hash.Hash32) (err error) {

// str builds filename with format <file-creation-ts> + `-` + `compactor` + `-` + <oldest-chunk-start-ts> + `-` + <latest-chunk-end-ts> `-` + <index-checksum>
func (i SingleTenantTSDBIdentifier) str() string {
ts := int64(0)
if i.exportTSInSecs {
ts = i.TS.Unix()
} else {
ts = i.TS.UnixNano()
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: I find this a bit hacky. I think a bool flag writeTSAsSecs would read better.

}
return fmt.Sprintf(
"%d-%s-%d-%d-%x.tsdb",
i.TS.UnixNano(),
ts,
compactedFileUploader,
i.From,
i.Through,
Expand Down Expand Up @@ -140,10 +151,11 @@ func ParseSingleTenantTSDBPath(p string) (id SingleTenantTSDBIdentifier, ok bool
parsedTS = time.Unix(0, ts)
}
return SingleTenantTSDBIdentifier{
TS: parsedTS,
From: model.Time(from),
Through: model.Time(through),
Checksum: uint32(checksum),
exportTSInSecs: len(elems[0]) <= 10,
TS: parsedTS,
From: model.Time(from),
Through: model.Time(through),
Checksum: uint32(checksum),
}, true

}
Expand Down
30 changes: 18 additions & 12 deletions pkg/storage/stores/shipper/indexshipper/tsdb/identifier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,35 @@ func TestParseSingleTenantTSDBPath(t *testing.T) {
desc: "simple_works",
input: "1-compactor-1-10-ff.tsdb",
id: SingleTenantTSDBIdentifier{
TS: time.Unix(1, 0),
From: 1,
Through: 10,
Checksum: 255,
exportTSInSecs: true,
TS: time.Unix(1, 0),
From: 1,
Through: 10,
Checksum: 255,
},
ok: true,
},
{
desc: "simple_works_with_nanosecond",
input: "1712534400000000000-compactor-1-10-ff.tsdb",
id: SingleTenantTSDBIdentifier{
TS: time.Unix(0, 1712534400000000000),
From: 1,
Through: 10,
Checksum: 255,
exportTSInSecs: false,
TS: time.Unix(0, 1712534400000000000),
From: 1,
Through: 10,
Checksum: 255,
},
ok: true,
},
{
desc: "uint32_max_checksum_works",
input: fmt.Sprintf("1-compactor-1-10-%x.tsdb", math.MaxUint32),
id: SingleTenantTSDBIdentifier{
TS: time.Unix(1, 0),
From: 1,
Through: 10,
Checksum: math.MaxUint32,
exportTSInSecs: true,
TS: time.Unix(1, 0),
From: 1,
Through: 10,
Checksum: math.MaxUint32,
},
ok: true,
},
Expand All @@ -69,6 +72,9 @@ func TestParseSingleTenantTSDBPath(t *testing.T) {
id, ok := ParseSingleTenantTSDBPath(tc.input)
require.Equal(t, tc.ok, ok)
require.Equal(t, tc.id, id)
if ok {
require.Equal(t, tc.input, id.Name())
}
})
}
}
Loading