Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
This commit is contained in:
Krasi Georgiev 2019-02-11 11:25:57 +02:00
parent d48606827c
commit 07df4fd383
2 changed files with 3 additions and 4 deletions

View file

@ -746,7 +746,7 @@ func TestDisableAutoCompactions(t *testing.T) {
testutil.Assert(t, len(db.Blocks()) > 0, "No block was persisted after the set timeout.") testutil.Assert(t, len(db.Blocks()) > 0, "No block was persisted after the set timeout.")
} }
// TestDeleteCompactionBlockAfterFailedReload ensures that a failed reload imidiately after a compaction // TestDeleteCompactionBlockAfterFailedReload ensures that a failed reload immediately after a compaction
// deletes the resulting block to avoid creatings blocks with the same time range. // deletes the resulting block to avoid creatings blocks with the same time range.
func TestDeleteCompactionBlockAfterFailedReload(t *testing.T) { func TestDeleteCompactionBlockAfterFailedReload(t *testing.T) {
@ -796,7 +796,7 @@ func TestDeleteCompactionBlockAfterFailedReload(t *testing.T) {
expBlocks := bootStrap(db) expBlocks := bootStrap(db)
// Create a block that will trigger the reloard to fail. // Create a block that will trigger the reload to fail.
blockPath := createBlock(t, db.Dir(), genSeries(1, 1, 200, 300)) blockPath := createBlock(t, db.Dir(), genSeries(1, 1, 200, 300))
lastBlockIndex := path.Join(blockPath, indexFilename) lastBlockIndex := path.Join(blockPath, indexFilename)
actBlocks, err := blockDirs(db.Dir()) actBlocks, err := blockDirs(db.Dir())
@ -810,7 +810,6 @@ func TestDeleteCompactionBlockAfterFailedReload(t *testing.T) {
// Do the compaction and check the metrics. // Do the compaction and check the metrics.
// Compaction should succeed, but the reload should fail and // Compaction should succeed, but the reload should fail and
// the new block created from the compaction should be deleted. // the new block created from the compaction should be deleted.
db.EnableCompactions()
testutil.NotOk(t, db.compact()) testutil.NotOk(t, db.compact())
testutil.Equals(t, 1.0, prom_testutil.ToFloat64(db.metrics.reloadsFailed), "'failed db reload' count metrics mismatch") testutil.Equals(t, 1.0, prom_testutil.ToFloat64(db.metrics.reloadsFailed), "'failed db reload' count metrics mismatch")
testutil.Equals(t, 1.0, prom_testutil.ToFloat64(db.compactor.(*LeveledCompactor).metrics.ran), "`compaction` count metric mismatch") testutil.Equals(t, 1.0, prom_testutil.ToFloat64(db.compactor.(*LeveledCompactor).metrics.ran), "`compaction` count metric mismatch")

View file

@ -452,7 +452,7 @@ func TestDB_Snapshot(t *testing.T) {
querier, err := db.Querier(mint, mint+1000) querier, err := db.Querier(mint, mint+1000)
testutil.Ok(t, err) testutil.Ok(t, err)
defer func() { querier.Close() }() defer func() { testutil.Ok(t, querier.Close()) }()
// sum values // sum values
seriesSet, err := querier.Select(labels.NewEqualMatcher("foo", "bar")) seriesSet, err := querier.Select(labels.NewEqualMatcher("foo", "bar"))