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

move random() in TastyJobs to where it is more useful

Browse Source
This commit is contained in:
Oliver Gorwits
2018-02-23 23:54:08 +00:00
parent 78e5544dab
commit 93155d3f26
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@@ -8,6 +8,7 @@
[BUG FIXES] [BUG FIXES]
* avoid skips that go twice past max_deferrals not being reduced * avoid skips that go twice past max_deferrals not being reduced
* move random() in TastyJobs to where it is more useful
2.039010 - 2018-02-22 2.039010 - 2018-02-22

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

@@ -16,8 +16,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
ON (ds.backend = ? AND admin.device = ds.device ON (ds.backend = ? AND admin.device = ds.device
AND admin.action = ANY (ds.actionset)) AND admin.action = ANY (ds.actionset))
WHERE admin.status = 'queued' WHERE admin.status = 'queued'
AND ds.device IS NULL AND ds.device IS NULL)
ORDER BY random())
SELECT my_jobs.*, SELECT my_jobs.*,
CASE WHEN (my_jobs.username IS NOT NULL OR CASE WHEN (my_jobs.username IS NOT NULL OR
@@ -37,7 +36,8 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
ORDER BY job_priority DESC, ORDER BY job_priority DESC,
ds.deferrals ASC NULLS FIRST, ds.deferrals ASC NULLS FIRST,
ds.last_defer ASC NULLS LAST, ds.last_defer ASC NULLS LAST,
device_key DESC NULLS LAST device_key DESC NULLS LAST,
random()
LIMIT ? LIMIT ?
ENDSQL ENDSQL
); );