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

further tune job picker

Browse Source
This commit is contained in:
Oliver Gorwits
2018-06-17 21:55:18 +01:00
parent 13d5f04465
commit e39cf197bf
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
AND ds.device IS NULL) AND ds.device IS NULL)
SELECT my_jobs.*, SELECT my_jobs.*,
CASE WHEN ( (my_jobs.username IS NOT NULL AND (ds.deferrals = 0 CASE WHEN ( (my_jobs.username IS NOT NULL AND ((ds.deferrals IS NULL AND ds.last_defer IS NULL)
OR ds.last_defer IS NULL
OR my_jobs.entered > ds.last_defer)) OR my_jobs.entered > ds.last_defer))
OR (my_jobs.action = ANY (string_to_array(btrim(?, '{"}'), '","'))) ) OR (my_jobs.action = ANY (string_to_array(btrim(?, '{"}'), '","'))) )
THEN 100 THEN 100
@@ -31,9 +30,9 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
LEFT OUTER JOIN device_skip ds LEFT OUTER JOIN device_skip ds
ON (ds.backend = ? AND ds.device = my_jobs.device) ON (ds.backend = ? AND ds.device = my_jobs.device)
WHERE ((ds.deferrals < ?) OR (my_jobs.username IS NOT NULL AND (ds.deferrals = 0 WHERE ds.deferrals < ?
OR ds.last_defer IS NULL OR (my_jobs.username IS NOT NULL AND (ds.last_defer IS NULL
OR my_jobs.entered > ds.last_defer))) OR my_jobs.entered > ds.last_defer))
OR (ds.deferrals IS NULL AND ds.last_defer IS NULL) OR (ds.deferrals IS NULL AND ds.last_defer IS NULL)
OR ds.last_defer <= ( LOCALTIMESTAMP - ?::interval ) OR ds.last_defer <= ( LOCALTIMESTAMP - ?::interval )