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

set stuck jobs as failed

Browse source
This commit is contained in:
Alfredo Cardigliano 2018-10-31 19:21:25 +01:00
parent 80c7664303
commit 3e6f2522ed
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
scripts/lua/modules/recording_utils.lua
View file

@ -226,21 +226,17 @@ end
function recording_utils.createConfig(ifid, params)
local ifname = getN2diskInterfaceName(ifid)
local real_ifname = ifname
if not interface.isPacketInterface() then
if recording_utils.isZC(ifname) then
-- real_ifname = ifname -- DEBUG
real_ifname = "zc:"..ifname
else
real_ifname = ifname
end
end
if isEmptyString(ifname) then
return false
end
local real_ifname = ifname
if not interface.isPacketInterface() and recording_utils.isZC(ifname) then
-- real_ifname = ifname -- DEBUG
real_ifname = "zc:"..ifname
end
local conf_dir = dirs.workingdir.."/n2disk"
local filename = conf_dir.."/n2disk-" .. getConfigInterfaceName(ifid) .. ".conf"
local storage_path = dirs.pcapdir
@ -489,7 +485,7 @@ function recording_utils.getExtractionJobs(ifid)
local job_json = ntop.getHashCache(extraction_jobs_key, id)
local job = json.decode(job_json)
if ifid == nil or job.ifid == ifid then
jobs[tonumber(id)] = json.decode(job_json)
jobs[tonumber(id)] = job
end
end
@ -534,6 +530,21 @@ function recording_utils.scheduleExtraction(ifid, params)
return job_info
end
local function setStuckJobsAsFailed()
local jobs = {}
local job_ids = ntop.getHashKeysCache(extraction_jobs_key) or {}
for id,_ in pairs(job_ids) do
local job_json = ntop.getHashCache(extraction_jobs_key, id)
local job = json.decode(job_json)
if job.status == "processing" then
job.status = "failed"
job.error_code = 9 -- stuck
ntop.setHashCache(extraction_jobs_key, job.id, json.encode(job))
end
end
end
local function setJobAsCompleted()
local datapath_extractions = ntop.getExtractionStatus()
for id,status in pairs(datapath_extractions) do
@ -553,6 +564,7 @@ local function setJobAsCompleted()
end
end
end
setStuckJobsAsFailed()
end
function recording_utils.checkExtractionJobs()