135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend field in jobqueue (#1114)

Browse Source 
implements #969
This commit is contained in:
Oliver Gorwits
2023-10-24 21:49:37 +01:00
committed by GitHub
parent d6e36dcad0
commit 21bc8cf63e
13 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB/Result/Virtual/PollerPerformance.pm
View File

@@ -24,7 +24,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
WHERE action IN ( 'discover', 'macsuck', 'arpnip', 'nbtstat' )
GROUP BY action, entered
HAVING count( device ) > 1
AND SUM( CASE WHEN status LIKE 'queued%' THEN 1 ELSE 0 END ) = 0
AND SUM( CASE WHEN status = 'queued' THEN 1 ELSE 0 END ) = 0
ORDER BY entered DESC, elapsed DESC
LIMIT 30
ENDSQL

1
lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
View File

@@ -16,6 +16,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
ON (ds.backend = ? AND admin.device = ds.device
AND admin.action = ANY (ds.actionset))
WHERE admin.status = 'queued'
AND admin.backend IS NULL
AND ds.device IS NULL)
SELECT my_jobs.*,

1
lib/App/Netdisco/DB/Result/Virtual/WalkJobs.pm
View File

@@ -15,6 +15,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
LEFT OUTER JOIN admin ON (device.ip = admin.device
AND admin.status = 'queued'
AND admin.backend IS NULL
AND admin.action = ?)
FULL OUTER JOIN device_skip ON (device_skip.device = device.ip