Skip to content

Commit

Permalink
Finally found a fix for the bug I was chasing for 2h...
Browse files Browse the repository at this point in the history
Signed-off-by: Bartlomiej Plotka <[email protected]>
  • Loading branch information
bwplotka committed Feb 17, 2020
1 parent 849faa4 commit aadffd1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tsdb/compact_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ func TestCancelCompactions(t *testing.T) {
}
// Measure the compaction time when closing the db in the middle of compaction.
{
db, err := open(tmpdirCopy, log.NewNopLogger(), nil, nil, []int64{1, 2000})
db, err := open(tmpdirCopy, log.NewNopLogger(), nil, DefaultOptions(), []int64{1, 2000})
testutil.Ok(t, err)
testutil.Equals(t, 3, len(db.Blocks()), "initial block count mismatch")
testutil.Equals(t, 0.0, prom_testutil.ToFloat64(db.compactor.(*LeveledCompactor).metrics.ran), "initial compaction counter mismatch")
Expand Down
7 changes: 6 additions & 1 deletion util/teststorage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ package teststorage
import (
"io/ioutil"
"os"
"time"

"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb"
"github.com/prometheus/prometheus/util/testutil"
Expand All @@ -32,7 +34,10 @@ func New(t testutil.T) storage.Storage {

// Tests just load data for a series sequentially. Thus we
// need a long appendable window.
db, err := tsdb.Open(dir, nil, nil, nil)
db, err := tsdb.Open(dir, nil, nil, &tsdb.Options{
MinBlockDuration: model.Duration(24 * time.Hour),
MaxBlockDuration: model.Duration(24 * time.Hour),
})
if err != nil {
t.Fatalf("Opening test storage failed: %s", err)
}
Expand Down

0 comments on commit aadffd1

Please sign in to comment.