mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-11 05:47:27 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Close Head in DBReadOnly.FlushWAL (#7022)

Browse source 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
This commit is contained in:
Ganesh Vernekar 2020-03-23 14:49:44 +05:30 committed by GitHub
parent e813f60fd6
commit e64a149984
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tsdb/db.go
View file

@ -294,7 +294,7 @@ func OpenDBReadOnly(dir string, l log.Logger) (*DBReadOnly, error) {
// Samples that are in existing blocks will not be written to the new block. // Samples that are in existing blocks will not be written to the new block.
// Note that if the read only database is running concurrently with a // Note that if the read only database is running concurrently with a
// writable database then writing the WAL to the database directory can race. // writable database then writing the WAL to the database directory can race.
func (db *DBReadOnly) FlushWAL(dir string) error { func (db *DBReadOnly) FlushWAL(dir string) (returnErr error) {
blockReaders, err := db.Blocks() blockReaders, err := db.Blocks()
if err != nil { if err != nil {
return errors.Wrap(err, "read blocks") return errors.Wrap(err, "read blocks")
@ -311,6 +311,12 @@ func (db *DBReadOnly) FlushWAL(dir string) error {
if err != nil { if err != nil {
return err return err
} }
defer func() {
var merr tsdb_errors.MultiError
merr.Add(returnErr)
merr.Add(errors.Wrap(head.Close(), "closing Head"))
returnErr = merr.Err()
}()
// Set the min valid time for the ingested wal samples // Set the min valid time for the ingested wal samples
// to be no lower than the maxt of the last block. // to be no lower than the maxt of the last block.
if err := head.Init(maxBlockTime); err != nil { if err := head.Init(maxBlockTime); err != nil {

5
tsdb/wal/wal.go
View file

@ -730,6 +730,11 @@ func (w *WAL) Close() (err error) {
return errors.New("wal already closed") return errors.New("wal already closed")
} }
if w.segment == nil {
w.closed = true
return nil
}
// Flush the last page and zero out all its remaining size. // Flush the last page and zero out all its remaining size.
// We must not flush an empty page as it would falsely signal // We must not flush an empty page as it would falsely signal
// the segment is done if we start writing to it again after opening. // the segment is done if we start writing to it again after opening.