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

Enforces deadline checks in rrd export timeseries.lua

Browse source
This commit is contained in:
Simone Mainardi 2020-03-02 19:27:55 +01:00
parent 1e82eb073b
commit cffe275832
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1132,7 +1132,8 @@ function driver:export()
local stats = {} -- Stats for every loop
local rrd_queue_max_poll_loops = 1
local rrd_queue_max_dequeues_per_loop = 8192
local deadline_approaching = false
for cur_loop=1, rrd_queue_max_poll_loops do
-- Iterate all interfaces in a round-robin fashion to
-- make sure every one gets a chance to have its points written
@ -1140,6 +1141,7 @@ function driver:export()
stats[cur_loop] = {num_points = 0} -- Init a table to keep some stats
num_completed = 0 -- Reset it at every loop
deadline_approaching = false
for cur_ifid, iface in pairs(available_interfaces) do
if iface["completed"] then
@ -1182,6 +1184,12 @@ function driver:export()
if iface["completed"] then
num_completed = num_completed + 1
end
if ntop.isDeadlineApproaching() then
-- No time left (do this check after the processing of points for each interface)
deadline_approaching = true
break
end
end
stats[cur_loop]["num_completed"] = num_completed
@ -1190,6 +1198,13 @@ function driver:export()
stats[cur_loop]["done"] = true
break
end
stats[cur_loop]["deadline_approaching"] = deadline_approaching
if deadline_approaching then
-- No time to do additional loops, let's return
tprint("exiting...")
break
end
end
end