skipover now implicit from deferrals/actionset; fix sql where logic with better correlation
This commit is contained in:
@@ -40,10 +40,7 @@ sub _getsome {
|
||||
|
||||
my $rs = $jobs->search({
|
||||
status => 'queued',
|
||||
device => { '-not_in' => $jobs->correlate('skipped')->search({
|
||||
backend => $fqdn,
|
||||
-or => [{ deferrals => { '>=', 10 } },{ '-bool' => 'skipover' }],
|
||||
}, { columns => 'device' })->as_query },
|
||||
device => { '-not_in' => $jobs->skipped->columns('device')->as_query },
|
||||
%$where,
|
||||
}, { order_by => 'random()', rows => $num_slots });
|
||||
|
||||
@@ -130,7 +127,6 @@ sub jq_prime_skiplist {
|
||||
backend => $fqdn,
|
||||
device => $_,
|
||||
actionset => $actionset{$_},
|
||||
skipover => \'true',
|
||||
}} keys %actionset
|
||||
]);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user