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

#398 user submitted jobs are run regardless of max deferrals

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-18 21:57:26 +01:00
parent 61211cfd20
commit ea592c6b28
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
LEFT OUTER JOIN device_skip ds
ON (ds.backend = ? AND ds.device = my_jobs.device)
WHERE ds.deferrals < ?
WHERE ((ds.deferrals < ?) OR my_jobs.username IS NOT NULL)
OR (ds.deferrals IS NULL AND ds.last_defer IS NULL)
OR ds.last_defer <= ( LOCALTIMESTAMP - ?::interval )

2
lib/App/Netdisco/JobQueue/PostgreSQL.pm
View File

@@ -241,7 +241,7 @@ sub jq_complete {
# now that SNMP connect failures are deferrals and not errors, any complete
# status, whether success or failure, indicates an SNMP connect. reset the
# connection failures counter to forget oabout occasional connect glitches.
# connection failures counter to forget about occasional connect glitches.
try {
schema('netdisco')->txn_do(sub {