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

fix wal panic when page flush fails. (#582)

Browse source 
* fix wal panic when page flush fails.

New records should be added to the page only when the last flush
succeeded. Otherwise the page would be full and panics when trying to
add a new record.

Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>
This commit is contained in:
Krasi Georgiev 2019-05-16 16:40:43 +03:00 committed by GitHub
parent 30d0ea59d7
commit 96a87845cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
wal/wal.go
View file

@ -426,10 +426,10 @@ func (w *WAL) flushPage(clear bool) error {
p := w.page p := w.page
clear = clear || p.full() clear = clear || p.full()
// No more data will fit into the page. Enqueue and clear it. // No more data will fit into the page or an implicit clear.
// Enqueue and clear it.
if clear { if clear {
p.alloc = pageSize // Write till end of page. p.alloc = pageSize // Write till end of page.
w.pageCompletions.Inc()
} }
n, err := w.segment.Write(p.buf[p.flushed:p.alloc]) n, err := w.segment.Write(p.buf[p.flushed:p.alloc])
if err != nil { if err != nil {
@ -445,6 +445,7 @@ func (w *WAL) flushPage(clear bool) error {
p.alloc = 0 p.alloc = 0
p.flushed = 0 p.flushed = 0
w.donePages++ w.donePages++
w.pageCompletions.Inc()
} }
return nil return nil
} }
@ -495,10 +496,18 @@ func (w *WAL) Log(recs ...[]byte) error {
return nil return nil
} }
// log writes rec to the log and forces a flush of the current page if its // log writes rec to the log and forces a flush of the current page if:
// the final record of a batch, the record is bigger than the page size or // - the final record of a batch
// the current page is full. // - the record is bigger than the page size
// - the current page is full.
func (w *WAL) log(rec []byte, final bool) error { func (w *WAL) log(rec []byte, final bool) error {
// When the last page flush failed the page will remain full.
// When the page is full, need to flush it before trying to add more records to it.
if w.page.full() {
if err := w.flushPage(true); err != nil {
return err
}
}
// If the record is too big to fit within the active page in the current // If the record is too big to fit within the active page in the current
// segment, terminate the active segment and advance to the next one. // segment, terminate the active segment and advance to the next one.
// This ensures that records do not cross segment boundaries. // This ensures that records do not cross segment boundaries.