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

avoid skips that go twice past max_deferrals not being reduced

Browse Source
This commit is contained in:
Oliver Gorwits
2018-02-23 23:47:39 +00:00
parent 5a5970e220
commit 78e5544dab
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Changes
View File

@@ -5,6 +5,10 @@
* use PG COPY for bulk insert of jobs with prefix * use PG COPY for bulk insert of jobs with prefix
* support IP prefix enum expansion in scheduler * support IP prefix enum expansion in scheduler
[BUG FIXES]
* avoid skips that go twice past max_deferrals not being reduced
2.039010 - 2018-02-22 2.039010 - 2018-02-22
[NEW FEATURES] [NEW FEATURES]

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

@@ -61,10 +61,11 @@ sub jq_warm_thrusters {
backend => setting('workers')->{'BACKEND'}, backend => setting('workers')->{'BACKEND'},
}, { for => 'update' }, )->update({ actionset => [] }); }, { for => 'update' }, )->update({ actionset => [] });
my $deferrals = setting('workers')->{'max_deferrals'} - 1;
$rs->search({ $rs->search({
backend => setting('workers')->{'BACKEND'}, backend => setting('workers')->{'BACKEND'},
deferrals => { '>' => 0 }, deferrals => { '>' => $deferrals },
}, { for => 'update' }, )->update({ deferrals => \'deferrals - 1' }); }, { for => 'update' }, )->update({ deferrals => $deferrals });
$rs->search({ $rs->search({
backend => setting('workers')->{'BACKEND'}, backend => setting('workers')->{'BACKEND'},