mirror of
https://github.com/prometheus/prometheus.git
synced 2024-11-09 23:24:05 -08:00
selectOverlappingDirs selects wrong dirs where there are 2 disjoint sets of overlapping dirs
Signed-off-by: naivewong <867245430@qq.com>
This commit is contained in:
naivewong
Krasi Georgiev
parent
8b33ee9e2b
commit
7ab060c864
|
|
@ -3,6 +3,7 @@
|
|||
- [REMOVED] `chunks.NewReader` is removed as it wasn't used anywhere.
|
||||
- [REMOVED] `FromData` is considered unused so was removed.
|
||||
- [FEATURE] Added option WALSegmentSize -1 to disable the WAL.
|
||||
- [BUGFIX] Bugfix in selectOverlappingDirs. Only return the first overlapping blocks.
|
||||
- [BUGFIX] Fsync the meta file to persist it on disk to avoid data loss in case of a host crash.
|
||||
- [BUGFIX] Fix fd and vm_area leak on error path in chunks.NewDirReader.
|
||||
- [BUGFIX] Fix fd and vm_area leak on error path in index.NewFileReader.
|
||||
|
|
|
|||
|
|
@ -267,8 +267,8 @@ func (c *LeveledCompactor) selectDirs(ds []dirMeta) []dirMeta {
|
|||
return nil
|
||||
}
|
||||
|
||||
// selectOverlappingDirs returns all dirs with overlaping time ranges.
|
||||
// It expects sorted input by mint.
|
||||
// selectOverlappingDirs returns all dirs with overlapping time ranges.
|
||||
// It expects sorted input by mint and returns the overlapping dirs in the same order as received.
|
||||
func (c *LeveledCompactor) selectOverlappingDirs(ds []dirMeta) []string {
|
||||
if len(ds) < 2 {
|
||||
return nil
|
||||
|
|
@ -281,6 +281,8 @@ func (c *LeveledCompactor) selectOverlappingDirs(ds []dirMeta) []string {
|
|||
overlappingDirs = append(overlappingDirs, ds[i].dir)
|
||||
}
|
||||
overlappingDirs = append(overlappingDirs, d.dir)
|
||||
} else if len(overlappingDirs) > 0 {
|
||||
break
|
||||
}
|
||||
if d.meta.MaxTime > globalMaxt {
|
||||
globalMaxt = d.meta.MaxTime
|
||||
|
|
|
|||
|
|
@ -173,27 +173,25 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
}, nil)
|
||||
testutil.Ok(t, err)
|
||||
|
||||
cases := []struct {
|
||||
cases := map[string]struct {
|
||||
metas []dirMeta
|
||||
expected []string
|
||||
}{
|
||||
{
|
||||
"Outside Range": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
},
|
||||
expected: nil,
|
||||
},
|
||||
// We should wait for four blocks of size 20 to appear before compacting.
|
||||
{
|
||||
"We should wait for four blocks of size 20 to appear before compacting.": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 20, 40, nil),
|
||||
},
|
||||
expected: nil,
|
||||
},
|
||||
// We should wait for a next block of size 20 to appear before compacting
|
||||
// the existing ones. We have three, but we ignore the fresh one from WAl.
|
||||
{
|
||||
`We should wait for a next block of size 20 to appear before compacting
|
||||
the existing ones. We have three, but we ignore the fresh one from WAl`: {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 20, 40, nil),
|
||||
|
|
@ -201,8 +199,7 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: nil,
|
||||
},
|
||||
// Block to fill the entire parent range appeared – should be compacted.
|
||||
{
|
||||
"Block to fill the entire parent range appeared – should be compacted": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 20, 40, nil),
|
||||
|
|
@ -211,9 +208,8 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"1", "2", "3"},
|
||||
},
|
||||
// Block for the next parent range appeared with gap with size 20. Nothing will happen in the first one
|
||||
// anymore but we ignore fresh one still, so no compaction.
|
||||
{
|
||||
`Block for the next parent range appeared with gap with size 20. Nothing will happen in the first one
|
||||
anymore but we ignore fresh one still, so no compaction`: {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 20, 40, nil),
|
||||
|
|
@ -221,9 +217,8 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: nil,
|
||||
},
|
||||
// Block for the next parent range appeared, and we have a gap with size 20 between second and third block.
|
||||
// We will not get this missed gap anymore and we should compact just these two.
|
||||
{
|
||||
`Block for the next parent range appeared, and we have a gap with size 20 between second and third block.
|
||||
We will not get this missed gap anymore and we should compact just these two.`: {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 20, 40, nil),
|
||||
|
|
@ -232,8 +227,7 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"1", "2"},
|
||||
},
|
||||
{
|
||||
// We have 20, 20, 20, 60, 60 range blocks. "5" is marked as fresh one.
|
||||
"We have 20, 20, 20, 60, 60 range blocks. '5' is marked as fresh one": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 20, 40, nil),
|
||||
|
|
@ -243,8 +237,7 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"1", "2", "3"},
|
||||
},
|
||||
{
|
||||
// We have 20, 60, 20, 60, 240 range blocks. We can compact 20 + 60 + 60.
|
||||
"We have 20, 60, 20, 60, 240 range blocks. We can compact 20 + 60 + 60": {
|
||||
metas: []dirMeta{
|
||||
metaRange("2", 20, 40, nil),
|
||||
metaRange("4", 60, 120, nil),
|
||||
|
|
@ -254,8 +247,7 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"2", "4", "6"},
|
||||
},
|
||||
// Do not select large blocks that have many tombstones when there is no fresh block.
|
||||
{
|
||||
"Do not select large blocks that have many tombstones when there is no fresh block": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 540, &BlockStats{
|
||||
NumSeries: 10,
|
||||
|
|
@ -264,8 +256,7 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: nil,
|
||||
},
|
||||
// Select large blocks that have many tombstones when fresh appears.
|
||||
{
|
||||
"Select large blocks that have many tombstones when fresh appears": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 540, &BlockStats{
|
||||
NumSeries: 10,
|
||||
|
|
@ -275,8 +266,7 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"1"},
|
||||
},
|
||||
// For small blocks, do not compact tombstones, even when fresh appears.
|
||||
{
|
||||
"For small blocks, do not compact tombstones, even when fresh appears.": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 60, &BlockStats{
|
||||
NumSeries: 10,
|
||||
|
|
@ -286,9 +276,8 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: nil,
|
||||
},
|
||||
// Regression test: we were stuck in a compact loop where we always recompacted
|
||||
// the same block when tombstones and series counts were zero.
|
||||
{
|
||||
`Regression test: we were stuck in a compact loop where we always recompacted
|
||||
the same block when tombstones and series counts were zero`: {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 540, &BlockStats{
|
||||
NumSeries: 0,
|
||||
|
|
@ -298,12 +287,11 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: nil,
|
||||
},
|
||||
// Regression test: we were wrongly assuming that new block is fresh from WAL when its ULID is newest.
|
||||
// We need to actually look on max time instead.
|
||||
//
|
||||
// With previous, wrong approach "8" block was ignored, so we were wrongly compacting 5 and 7 and introducing
|
||||
// block overlaps.
|
||||
{
|
||||
`Regression test: we were wrongly assuming that new block is fresh from WAL when its ULID is newest.
|
||||
We need to actually look on max time instead.
|
||||
|
||||
With previous, wrong approach "8" block was ignored, so we were wrongly compacting 5 and 7 and introducing
|
||||
block overlaps`: {
|
||||
metas: []dirMeta{
|
||||
metaRange("5", 0, 360, nil),
|
||||
metaRange("6", 540, 560, nil), // Fresh one.
|
||||
|
|
@ -312,8 +300,10 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"7", "8"},
|
||||
},
|
||||
// For overlapping blocks.
|
||||
{
|
||||
// |--------------|
|
||||
// |----------------|
|
||||
// |--------------|
|
||||
"Overlapping blocks 1": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 19, 40, nil),
|
||||
|
|
@ -321,7 +311,10 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"1", "2"},
|
||||
},
|
||||
{
|
||||
// |--------------|
|
||||
// |--------------|
|
||||
// |--------------|
|
||||
"Overlapping blocks 2": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 20, 40, nil),
|
||||
|
|
@ -329,7 +322,10 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"2", "3"},
|
||||
},
|
||||
{
|
||||
// |--------------|
|
||||
// |---------------------|
|
||||
// |--------------|
|
||||
"Overlapping blocks 3": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 20, nil),
|
||||
metaRange("2", 10, 40, nil),
|
||||
|
|
@ -337,7 +333,11 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"1", "2", "3"},
|
||||
},
|
||||
{
|
||||
// |--------------|
|
||||
// |--------------------------------|
|
||||
// |--------------|
|
||||
// |--------------|
|
||||
"Overlapping blocks 4": {
|
||||
metas: []dirMeta{
|
||||
metaRange("5", 0, 360, nil),
|
||||
metaRange("6", 340, 560, nil),
|
||||
|
|
@ -346,10 +346,23 @@ func TestLeveledCompactor_plan(t *testing.T) {
|
|||
},
|
||||
expected: []string{"5", "6", "7", "8"},
|
||||
},
|
||||
// |--------------|
|
||||
// |--------------|
|
||||
// |--------------|
|
||||
// |--------------|
|
||||
"Overlapping blocks 5": {
|
||||
metas: []dirMeta{
|
||||
metaRange("1", 0, 10, nil),
|
||||
metaRange("2", 9, 20, nil),
|
||||
metaRange("3", 30, 40, nil),
|
||||
metaRange("4", 39, 50, nil),
|
||||
},
|
||||
expected: []string{"1", "2"},
|
||||
},
|
||||
}
|
||||
|
||||
for _, c := range cases {
|
||||
if !t.Run("", func(t *testing.T) {
|
||||
for title, c := range cases {
|
||||
if !t.Run(title, func(t *testing.T) {
|
||||
res, err := compactor.plan(c.metas)
|
||||
testutil.Ok(t, err)
|
||||
testutil.Equals(t, c.expected, res)
|
||||
|
|
|
|||
67
db_test.go
67
db_test.go
|
|
@ -1706,8 +1706,10 @@ func TestCorrectNumTombstones(t *testing.T) {
|
|||
|
||||
func TestVerticalCompaction(t *testing.T) {
|
||||
cases := []struct {
|
||||
blockSeries [][]Series
|
||||
expSeries map[string][]tsdbutil.Sample
|
||||
blockSeries [][]Series
|
||||
expSeries map[string][]tsdbutil.Sample
|
||||
expBlockNum int
|
||||
expOverlappingBlocks int
|
||||
}{
|
||||
// Case 0
|
||||
// |--------------|
|
||||
|
|
@ -1734,6 +1736,8 @@ func TestVerticalCompaction(t *testing.T) {
|
|||
sample{8, 99}, sample{9, 99}, sample{10, 99}, sample{11, 99},
|
||||
sample{12, 99}, sample{13, 99}, sample{14, 99},
|
||||
}},
|
||||
expBlockNum: 1,
|
||||
expOverlappingBlocks: 1,
|
||||
},
|
||||
// Case 1
|
||||
// |-------------------------------|
|
||||
|
|
@ -1760,6 +1764,8 @@ func TestVerticalCompaction(t *testing.T) {
|
|||
sample{8, 99}, sample{9, 99}, sample{10, 99}, sample{11, 0},
|
||||
sample{13, 0}, sample{17, 0},
|
||||
}},
|
||||
expBlockNum: 1,
|
||||
expOverlappingBlocks: 1,
|
||||
},
|
||||
// Case 2
|
||||
// |-------------------------------|
|
||||
|
|
@ -1794,6 +1800,8 @@ func TestVerticalCompaction(t *testing.T) {
|
|||
sample{14, 59}, sample{15, 59}, sample{17, 59}, sample{20, 59},
|
||||
sample{21, 59}, sample{22, 59},
|
||||
}},
|
||||
expBlockNum: 1,
|
||||
expOverlappingBlocks: 1,
|
||||
},
|
||||
// Case 3
|
||||
// |-------------------|
|
||||
|
|
@ -1828,6 +1836,8 @@ func TestVerticalCompaction(t *testing.T) {
|
|||
sample{15, 59}, sample{16, 99}, sample{17, 59}, sample{20, 59},
|
||||
sample{21, 59}, sample{22, 59},
|
||||
}},
|
||||
expBlockNum: 1,
|
||||
expOverlappingBlocks: 1,
|
||||
},
|
||||
// Case 4
|
||||
// |-------------------------------------|
|
||||
|
|
@ -1864,6 +1874,8 @@ func TestVerticalCompaction(t *testing.T) {
|
|||
sample{13, 99}, sample{15, 99}, sample{16, 99}, sample{17, 99},
|
||||
sample{20, 0}, sample{22, 0},
|
||||
}},
|
||||
expBlockNum: 1,
|
||||
expOverlappingBlocks: 1,
|
||||
},
|
||||
// Case 5: series are merged properly when there are multiple series.
|
||||
// |-------------------------------------|
|
||||
|
|
@ -1958,6 +1970,53 @@ func TestVerticalCompaction(t *testing.T) {
|
|||
sample{20, 0}, sample{22, 0},
|
||||
},
|
||||
},
|
||||
expBlockNum: 1,
|
||||
expOverlappingBlocks: 1,
|
||||
},
|
||||
// Case 6
|
||||
// |--------------|
|
||||
// |----------------|
|
||||
// |--------------|
|
||||
// |----------------|
|
||||
{
|
||||
blockSeries: [][]Series{
|
||||
[]Series{
|
||||
newSeries(map[string]string{"a": "b"}, []tsdbutil.Sample{
|
||||
sample{0, 0}, sample{1, 0}, sample{2, 0}, sample{4, 0},
|
||||
sample{5, 0}, sample{7, 0}, sample{8, 0}, sample{9, 0},
|
||||
}),
|
||||
},
|
||||
[]Series{
|
||||
newSeries(map[string]string{"a": "b"}, []tsdbutil.Sample{
|
||||
sample{3, 99}, sample{5, 99}, sample{6, 99}, sample{7, 99},
|
||||
sample{8, 99}, sample{9, 99}, sample{10, 99}, sample{11, 99},
|
||||
sample{12, 99}, sample{13, 99}, sample{14, 99},
|
||||
}),
|
||||
},
|
||||
[]Series{
|
||||
newSeries(map[string]string{"a": "b"}, []tsdbutil.Sample{
|
||||
sample{20, 0}, sample{21, 0}, sample{22, 0}, sample{24, 0},
|
||||
sample{25, 0}, sample{27, 0}, sample{28, 0}, sample{29, 0},
|
||||
}),
|
||||
},
|
||||
[]Series{
|
||||
newSeries(map[string]string{"a": "b"}, []tsdbutil.Sample{
|
||||
sample{23, 99}, sample{25, 99}, sample{26, 99}, sample{27, 99},
|
||||
sample{28, 99}, sample{29, 99}, sample{30, 99}, sample{31, 99},
|
||||
}),
|
||||
},
|
||||
},
|
||||
expSeries: map[string][]tsdbutil.Sample{`{a="b"}`: {
|
||||
sample{0, 0}, sample{1, 0}, sample{2, 0}, sample{3, 99},
|
||||
sample{4, 0}, sample{5, 99}, sample{6, 99}, sample{7, 99},
|
||||
sample{8, 99}, sample{9, 99}, sample{10, 99}, sample{11, 99},
|
||||
sample{12, 99}, sample{13, 99}, sample{14, 99},
|
||||
sample{20, 0}, sample{21, 0}, sample{22, 0}, sample{23, 99},
|
||||
sample{24, 0}, sample{25, 99}, sample{26, 99}, sample{27, 99},
|
||||
sample{28, 99}, sample{29, 99}, sample{30, 99}, sample{31, 99},
|
||||
}},
|
||||
expBlockNum: 2,
|
||||
expOverlappingBlocks: 2,
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -1995,9 +2054,9 @@ func TestVerticalCompaction(t *testing.T) {
|
|||
testutil.Equals(t, 0, int(prom_testutil.ToFloat64(lc.metrics.overlappingBlocks)), "overlapping blocks count should be still 0 here")
|
||||
err = db.compact()
|
||||
testutil.Ok(t, err)
|
||||
testutil.Equals(t, 1, len(db.Blocks()), "Wrong number of blocks [after compact]")
|
||||
testutil.Equals(t, c.expBlockNum, len(db.Blocks()), "Wrong number of blocks [after compact]")
|
||||
|
||||
testutil.Equals(t, 1, int(prom_testutil.ToFloat64(lc.metrics.overlappingBlocks)), "overlapping blocks count mismatch")
|
||||
testutil.Equals(t, c.expOverlappingBlocks, int(prom_testutil.ToFloat64(lc.metrics.overlappingBlocks)), "overlapping blocks count mismatch")
|
||||
|
||||
// Query test after merging the overlapping blocks.
|
||||
querier, err = db.Querier(0, 100)
|
||||
|
|
|
|||
Loading…
Reference in a new issue