mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 21:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix-up tsdb-typo (#5954)

Browse source 
Signed-off-by: chentanjun <2799194073@qq.com>
This commit is contained in:
陈谭军 2019-08-28 21:43:02 +08:00 committed by Brian Brazil
parent 6141a8bd7c
commit 50d453b3c3
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tsdb/CHANGELOG.md
View file

@ -78,7 +78,7 @@
- [ENHANCEMENT] When closing the db any running compaction will be cancelled so it doesn't block. - [ENHANCEMENT] When closing the db any running compaction will be cancelled so it doesn't block.
- `NewLeveledCompactor` takes a context. - `NewLeveledCompactor` takes a context.
- [CHANGE] `prometheus_tsdb_storage_blocks_bytes_total` is now `prometheus_tsdb_storage_blocks_bytes`. - [CHANGE] `prometheus_tsdb_storage_blocks_bytes_total` is now `prometheus_tsdb_storage_blocks_bytes`.
- [BUGFIX] Improved Postings Merge performance. Fixes a regression from the the previous release. - [BUGFIX] Improved Postings Merge performance. Fixes a regression from the previous release.
- [BUGFIX] LiveReader can get into an infinite loop on corrupt WALs. - [BUGFIX] LiveReader can get into an infinite loop on corrupt WALs.
## 0.4.0 ## 0.4.0

2
tsdb/db_test.go
View file

@ -1112,7 +1112,7 @@ func TestSizeRetention(t *testing.T) {
// Test that registered size matches the actual disk size. // Test that registered size matches the actual disk size.
testutil.Ok(t, db.reload()) // Reload the db to register the new db size. testutil.Ok(t, db.reload()) // Reload the db to register the new db size.
testutil.Equals(t, len(blocks), len(db.Blocks())) // Ensure all blocks are registered. testutil.Equals(t, len(blocks), len(db.Blocks())) // Ensure all blocks are registered.
expSize := int64(prom_testutil.ToFloat64(db.metrics.blocksBytes)) // Use the the actual internal metrics. expSize := int64(prom_testutil.ToFloat64(db.metrics.blocksBytes)) // Use the actual internal metrics.
actSize := testutil.DirSize(t, db.Dir()) actSize := testutil.DirSize(t, db.Dir())
testutil.Equals(t, expSize, actSize, "registered size doesn't match actual disk size") testutil.Equals(t, expSize, actSize, "registered size doesn't match actual disk size")

2
tsdb/querier_test.go
View file

@ -570,7 +570,7 @@ func TestBaseChunkSeries(t *testing.T) {
cases := []struct { cases := []struct {
series []refdSeries series []refdSeries
// Postings should be in the sorted order of the the series // Postings should be in the sorted order of the series
postings []uint64 postings []uint64
expIdxs []int expIdxs []int

2
tsdb/wal.go
View file

@ -280,7 +280,7 @@ func (w *SegmentWAL) truncate(err error, file int, lastOffset int64) error {
return err return err
} }
// Reader returns a new reader over the the write ahead log data. // Reader returns a new reader over the write ahead log data.
// It must be completely consumed before writing to the WAL. // It must be completely consumed before writing to the WAL.
func (w *SegmentWAL) Reader() WALReader { func (w *SegmentWAL) Reader() WALReader {
return &repairingWALReader{ return &repairingWALReader{

2
tsdb/wal/wal.go
View file

@ -402,7 +402,7 @@ func (w *WAL) Repair(origErr error) error {
return errors.Wrap(err, "delete corrupted segment") return errors.Wrap(err, "delete corrupted segment")
} }
// Explicitly close the the segment we just repaired to avoid issues with Windows. // Explicitly close the segment we just repaired to avoid issues with Windows.
s.Close() s.Close()
// We always want to start writing to a new Segment rather than an existing // We always want to start writing to a new Segment rather than an existing