From 5bb258ff0070c5b23300f88b271be829ffa07106 Mon Sep 17 00:00:00 2001 From: DanB Date: Sat, 30 Sep 2017 19:28:32 +0200 Subject: [PATCH] Disable marking events to be stored if storeInterval is 0 for resources and stats --- engine/resources.go | 5 ++++- engine/stats.go | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/resources.go b/engine/resources.go index 6630e1636..d50b3c524 100755 --- a/engine/resources.go +++ b/engine/resources.go @@ -574,9 +574,12 @@ func (rS *ResourceService) V1AllocateResource(args utils.ArgRSv1ResourceUsage, r } // index it for storing for _, r := range mtcRLs { + if rS.storeInterval == 0 || r.dirty == nil { + continue + } if rS.storeInterval == -1 { rS.StoreResource(r) - } else if r.dirty != nil { + } else { *r.dirty = true // mark it to be saved rS.srMux.Lock() rS.storedResources[r.TenantID()] = true diff --git a/engine/stats.go b/engine/stats.go index d73d31f67..323086b33 100644 --- a/engine/stats.go +++ b/engine/stats.go @@ -213,9 +213,12 @@ func (sS *StatService) processEvent(ev *StatEvent) (err error) { sq.TenantID(), ev.TenantID(), err.Error())) withErrors = true } + if sS.storeInterval == 0 || sq.dirty == nil { // don't save + continue + } if sS.storeInterval == -1 { sS.StoreStatQueue(sq) - } else if sq.dirty != nil { + } else { *sq.dirty = true // mark it to be saved sS.ssqMux.Lock() sS.storedStatQueues[sq.TenantID()] = true