mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-24 21:24:05 -08:00
Merge pull request #135 from alin-amana/fix_eval_blocking_on_fsync
Don't do blocking disk I/O under mutex blocking scrape and eval
This commit is contained in:
commit
0fe67df9f2
29
wal.go
29
wal.go
|
@ -298,22 +298,41 @@ func (w *SegmentWAL) tail() *os.File {
|
|||
|
||||
// Sync flushes the changes to disk.
|
||||
func (w *SegmentWAL) Sync() error {
|
||||
var tail *os.File
|
||||
var err error
|
||||
|
||||
// Flush the writer and retrieve the reference to the tail segment under mutex lock
|
||||
func() {
|
||||
w.mtx.Lock()
|
||||
defer w.mtx.Unlock()
|
||||
if err = w.flush(); err != nil {
|
||||
return
|
||||
}
|
||||
tail = w.tail()
|
||||
} ()
|
||||
|
||||
return w.sync()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// But only fsync the tail segment after releasing the mutex as it will block on disk I/O
|
||||
return fileutil.Fdatasync(tail)
|
||||
}
|
||||
|
||||
func (w *SegmentWAL) sync() error {
|
||||
if w.cur == nil {
|
||||
return nil
|
||||
}
|
||||
if err := w.cur.Flush(); err != nil {
|
||||
if err := w.flush(); err != nil {
|
||||
return err
|
||||
}
|
||||
return fileutil.Fdatasync(w.tail())
|
||||
}
|
||||
|
||||
func (w *SegmentWAL) flush() error {
|
||||
if w.cur == nil {
|
||||
return nil
|
||||
}
|
||||
return w.cur.Flush()
|
||||
}
|
||||
|
||||
func (w *SegmentWAL) run(interval time.Duration) {
|
||||
var tick <-chan time.Time
|
||||
|
||||
|
|
Loading…
Reference in a new issue