vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 07:59:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid reporting the last point when the timeseries write has not completed yet

Browse source 
Fixes #3478
This commit is contained in:
emanuele-f 2020-03-02 12:11:08 +01:00
parent 3f9f263053
commit 32bf3b1ac4
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/lua/modules/timeseries/drivers/rrd.lua
View file

@ -586,12 +586,20 @@ function driver:query(schema, tstart, tend, tags, options)
return nil
end
touchRRD(rrdfile)
local last_update = ntop.rrd_lastupdate(rrdfile)
if isDebugEnabled() then
traceError(TRACE_NORMAL, TRACE_CONSOLE, string.format("RRD_FETCH schema=%s %s -> (%s): last_update=%u",
schema.name, table.tconcat(tags, "=", ","), rrdfile, ntop.rrd_lastupdate(rrdfile)))
schema.name, table.tconcat(tags, "=", ","), rrdfile, last_update))
end
touchRRD(rrdfile)
-- Avoid reporting the last point when the timeseries write has not completed
-- yet. Use 2*step as a bound.
if((tend > last_update) and ((tend - last_update) <= 2*schema.options.step)) then
tend = last_update
end
--tprint("rrdtool fetch ".. rrdfile.. " " .. getConsolidationFunction(schema) .. " -s ".. tstart .. " -e " .. tend)
local fstart, fstep, fdata, fend, fcount = ntop.rrd_fetch_columns(rrdfile, getConsolidationFunction(schema), tstart, tend)