RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve usability of snapshots

This commit is contained in:
Fabian Reinartz 2018-02-28 12:04:55 +01:00
parent f6c76078f5
commit 8cd32d8fd4
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compact.go
View File

@ -151,6 +151,13 @@ func (c *LeveledCompactor) Plan(dir string) ([]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// We do not include the most recently created block. This gives users a window
// of a full block size to piece-wise backup new data without having to care
// about data overlap.
if len(dirs) < 1 {
return nil, nil
}
dirs = dirs[:len(dirs)-1]
var dms []dirMeta var dms []dirMeta

8
db.go
View File

@ -633,8 +633,9 @@ func (db *DB) EnableCompactions() {
level.Info(db.logger).Log("msg", "compactions enabled") level.Info(db.logger).Log("msg", "compactions enabled")
} }
// Snapshot writes the current data to the directory. // Snapshot writes the current data to the directory. If withHead is set to true it
func (db *DB) Snapshot(dir string) error { // will create a new block containing all data that's currently in the memory buffer/WAL.
func (db *DB) Snapshot(dir string, withHead bool) error {
if dir == db.dir { if dir == db.dir {
return errors.Errorf("cannot snapshot into base directory") return errors.Errorf("cannot snapshot into base directory")
} }
@ -655,6 +656,9 @@ func (db *DB) Snapshot(dir string) error {
return errors.Wrapf(err, "error snapshotting block: %s", b.Dir()) return errors.Wrapf(err, "error snapshotting block: %s", b.Dir())
} }
} }
if !withHead {
return nil
}
_, err := db.compactor.Write(dir, db.head, db.head.MinTime(), db.head.MaxTime()) _, err := db.compactor.Write(dir, db.head, db.head.MinTime(), db.head.MaxTime())
return errors.Wrap(err, "snapshot head block") return errors.Wrap(err, "snapshot head block")
} }

15
db_test.go
View File

@ -351,8 +351,9 @@ func TestDB_Snapshot(t *testing.T) {
// create snapshot // create snapshot
snap, err := ioutil.TempDir("", "snap") snap, err := ioutil.TempDir("", "snap")
testutil.Ok(t, err) testutil.Ok(t, err)
defer os.RemoveAll(snap) defer os.RemoveAll(snap)
testutil.Ok(t, db.Snapshot(snap)) testutil.Ok(t, db.Snapshot(snap, true))
testutil.Ok(t, db.Close()) testutil.Ok(t, db.Close())
// reopen DB from snapshot // reopen DB from snapshot
@ -417,8 +418,9 @@ Outer:
// create snapshot // create snapshot
snap, err := ioutil.TempDir("", "snap") snap, err := ioutil.TempDir("", "snap")
testutil.Ok(t, err) testutil.Ok(t, err)
defer os.RemoveAll(snap) defer os.RemoveAll(snap)
testutil.Ok(t, db.Snapshot(snap)) testutil.Ok(t, db.Snapshot(snap, true))
testutil.Ok(t, db.Close()) testutil.Ok(t, db.Close())
// reopen DB from snapshot // reopen DB from snapshot
@ -688,8 +690,9 @@ func TestTombstoneClean(t *testing.T) {
// create snapshot // create snapshot
snap, err := ioutil.TempDir("", "snap") snap, err := ioutil.TempDir("", "snap")
testutil.Ok(t, err) testutil.Ok(t, err)
defer os.RemoveAll(snap) defer os.RemoveAll(snap)
testutil.Ok(t, db.Snapshot(snap)) testutil.Ok(t, db.Snapshot(snap, true))
testutil.Ok(t, db.Close()) testutil.Ok(t, db.Close())
// reopen DB from snapshot // reopen DB from snapshot
@ -766,8 +769,9 @@ func TestDB_Retention(t *testing.T) {
// TODO(gouthamve): Add a method to compact headblock. // TODO(gouthamve): Add a method to compact headblock.
snap, err := ioutil.TempDir("", "snap") snap, err := ioutil.TempDir("", "snap")
testutil.Ok(t, err) testutil.Ok(t, err)
defer os.RemoveAll(snap) defer os.RemoveAll(snap)
testutil.Ok(t, db.Snapshot(snap)) testutil.Ok(t, db.Snapshot(snap, true))
testutil.Ok(t, db.Close()) testutil.Ok(t, db.Close())
// reopen DB from snapshot // reopen DB from snapshot
@ -785,7 +789,8 @@ func TestDB_Retention(t *testing.T) {
snap, err = ioutil.TempDir("", "snap") snap, err = ioutil.TempDir("", "snap")
testutil.Ok(t, err) testutil.Ok(t, err)
defer os.RemoveAll(snap) defer os.RemoveAll(snap)
testutil.Ok(t, db.Snapshot(snap))
testutil.Ok(t, db.Snapshot(snap, true))
testutil.Ok(t, db.Close()) testutil.Ok(t, db.Close())
// reopen DB from snapshot // reopen DB from snapshot