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

Synchronise deletes and compactions. 

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
This commit is contained in:
Goutham Veeramachaneni 2017-05-20 13:21:10 +05:30
parent 3dbb400bef
commit d32eb25662
No known key found for this signature in database
GPG Key ID: F1C217E8E9023CAD
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db.go
View File

@ -125,6 +125,9 @@ type DB struct {
compactc chan struct{} compactc chan struct{}
donec chan struct{} donec chan struct{}
stopc chan struct{} stopc chan struct{}
// compMtx is used to control compactions and deletions.
cmtx sync.Mutex
} }
type dbMetrics struct { type dbMetrics struct {
@ -271,6 +274,9 @@ func (db *DB) retentionCutoff() (bool, error) {
} }
func (db *DB) compact() (changes bool, err error) { func (db *DB) compact() (changes bool, err error) {
db.cmtx.Lock()
defer db.cmtx.Unlock()
db.headmtx.RLock() db.headmtx.RLock()
// Check whether we have pending head blocks that are ready to be persisted. // Check whether we have pending head blocks that are ready to be persisted.
@ -671,14 +677,13 @@ func (a *dbAppender) Rollback() error {
// Delete implements deletion of metrics. // Delete implements deletion of metrics.
func (db *DB) Delete(mint, maxt int64, ms ...labels.Matcher) error { func (db *DB) Delete(mint, maxt int64, ms ...labels.Matcher) error {
s.mtx.RLock() db.cmtx.Lock()
defer db.cmtx.Unlock()
s.headmtx.RLock() s.headmtx.RLock()
blocks := s.blocksForInterval(mint, maxt) blocks := s.blocksForInterval(mint, maxt)
s.headmtx.RUnlock() s.headmtx.RUnlock()
// TODO(gouthamve): Wait for pending compactions and stop compactions until
// delete finishes.
var g errgroup.Group var g errgroup.Group
for _, b := range blocks { for _, b := range blocks {