RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Release 0.6.0 (#537)

This commit is contained in:
Krasi Georgiev 2019-03-02 15:54:49 +02:00 committed by GitHub
parent e78fedf054
commit ab8476dd06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
## master / unreleased ## master / unreleased
## 0.6.0
- [CHANGE] `AllowOverlappingBlock` is now `AllowOverlappingBlocks`.
## 0.5.0 ## 0.5.0
- [FEATURE] Time-ovelapping blocks are now allowed. [#370](https://github.com/prometheus/tsdb/pull/370) - [FEATURE] Time-ovelapping blocks are now allowed. [#370](https://github.com/prometheus/tsdb/pull/370)
- Disabled by default and can be enabled via `AllowOverlappingBlock` option. - Disabled by default and can be enabled via `AllowOverlappingBlock` option.

16
db.go
View File

@ -45,11 +45,11 @@ import (
// DefaultOptions used for the DB. They are sane for setups using // DefaultOptions used for the DB. They are sane for setups using
// millisecond precision timestamps. // millisecond precision timestamps.
var DefaultOptions = &Options{ var DefaultOptions = &Options{
WALSegmentSize: wal.DefaultSegmentSize, WALSegmentSize: wal.DefaultSegmentSize,
RetentionDuration: 15 * 24 * 60 * 60 * 1000, // 15 days in milliseconds RetentionDuration: 15 * 24 * 60 * 60 * 1000, // 15 days in milliseconds
BlockRanges: ExponentialBlockRanges(int64(2*time.Hour)/1e6, 3, 5), BlockRanges: ExponentialBlockRanges(int64(2*time.Hour)/1e6, 3, 5),
NoLockfile: false, NoLockfile: false,
AllowOverlappingBlock: false, AllowOverlappingBlocks: false,
} }
// Options of the DB storage. // Options of the DB storage.
@ -73,9 +73,9 @@ type Options struct {
// NoLockfile disables creation and consideration of a lock file. // NoLockfile disables creation and consideration of a lock file.
NoLockfile bool NoLockfile bool
// Overlapping blocks are allowed iff AllowOverlappingBlock is true. // Overlapping blocks are allowed if AllowOverlappingBlocks is true.
// This in-turn enables vertical compaction and vertical query merge. // This in-turn enables vertical compaction and vertical query merge.
AllowOverlappingBlock bool AllowOverlappingBlocks bool
} }
// Appender allows appending a batch of data. It must be completed with a // Appender allows appending a batch of data. It must be completed with a
@ -553,7 +553,7 @@ func (db *DB) reload() (err error) {
sort.Slice(loadable, func(i, j int) bool { sort.Slice(loadable, func(i, j int) bool {
return loadable[i].Meta().MinTime < loadable[j].Meta().MinTime return loadable[i].Meta().MinTime < loadable[j].Meta().MinTime
}) })
if !db.opts.AllowOverlappingBlock { if !db.opts.AllowOverlappingBlocks {
if err := validateBlockSequence(loadable); err != nil { if err := validateBlockSequence(loadable); err != nil {
return errors.Wrap(err, "invalid block sequence") return errors.Wrap(err, "invalid block sequence")
} }

2
db_test.go
View File

@ -1933,7 +1933,7 @@ func TestVerticalCompaction(t *testing.T) {
createBlock(t, tmpdir, series) createBlock(t, tmpdir, series)
} }
opts := *DefaultOptions opts := *DefaultOptions
opts.AllowOverlappingBlock = true opts.AllowOverlappingBlocks = true
db, err := Open(tmpdir, nil, nil, &opts) db, err := Open(tmpdir, nil, nil, &opts)
testutil.Ok(t, err) testutil.Ok(t, err)
defer func() { defer func() {