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

Take snapshot only after closing the WAL (#9328)

Browse source 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
Ganesh Vernekar 2021-09-13 18:30:41 +05:30 committed by GitHub
parent 05a816bfb7
commit 30534e99d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tsdb/head.go
View file

@ -1168,12 +1168,12 @@ func (h *Head) Close() error {
defer h.closedMtx.Unlock() defer h.closedMtx.Unlock()
h.closed = true h.closed = true
errs := tsdb_errors.NewMulti(h.chunkDiskMapper.Close()) errs := tsdb_errors.NewMulti(h.chunkDiskMapper.Close())
if errs.Err() == nil && h.opts.EnableMemorySnapshotOnShutdown {
errs.Add(h.performChunkSnapshot())
}
if h.wal != nil { if h.wal != nil {
errs.Add(h.wal.Close()) errs.Add(h.wal.Close())
} }
if errs.Err() == nil && h.opts.EnableMemorySnapshotOnShutdown {
errs.Add(h.performChunkSnapshot())
}
return errs.Err() return errs.Err()
} }

8
tsdb/head_test.go
View file

@ -2659,6 +2659,10 @@ func TestChunkSnapshot(t *testing.T) {
// These references should be the ones used for the snapshot. // These references should be the ones used for the snapshot.
wlast, woffset, err = head.wal.LastSegmentAndOffset() wlast, woffset, err = head.wal.LastSegmentAndOffset()
require.NoError(t, err) require.NoError(t, err)
if woffset != 0 && woffset < 32*1024 {
// The page is always filled before taking the snapshot.
woffset = 32 * 1024
}
{ {
// Creating snapshot and verifying it. // Creating snapshot and verifying it.
@ -2725,6 +2729,10 @@ func TestChunkSnapshot(t *testing.T) {
// Creating another snapshot should delete the older snapshot and replay still works fine. // Creating another snapshot should delete the older snapshot and replay still works fine.
wlast, woffset, err = head.wal.LastSegmentAndOffset() wlast, woffset, err = head.wal.LastSegmentAndOffset()
require.NoError(t, err) require.NoError(t, err)
if woffset != 0 && woffset < 32*1024 {
// The page is always filled before taking the snapshot.
woffset = 32 * 1024
}
{ {
// Close Head and verify that new snapshot was created. // Close Head and verify that new snapshot was created.