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

rename failures column to be deferrals

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-23 08:26:59 +01:00
parent 96ed444bbb
commit eac1857043
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB/Result/DeviceSkip.pm
View File

@@ -13,7 +13,7 @@ __PACKAGE__->add_columns(
{ data_type => "inet", is_nullable => 0 }, { data_type => "inet", is_nullable => 0 },
"action", "action",
{ data_type => "text", is_nullable => 0 }, { data_type => "text", is_nullable => 0 },
"failures", "deferrals",
{ data_type => "integer", is_nullable => 1, default_value => '0' }, { data_type => "integer", is_nullable => 1, default_value => '0' },
"skipover", "skipover",
{ data_type => "boolean", is_nullable => 1, default_value => \'false' }, { data_type => "boolean", is_nullable => 1, default_value => \'false' },

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

@@ -42,7 +42,7 @@ sub _getsome {
status => 'queued', status => 'queued',
device => { '-not_in' => $jobs->correlate('skipped')->search({ device => { '-not_in' => $jobs->correlate('skipped')->search({
backend => $fqdn, backend => $fqdn,
-or => [{ failures => { '>=', 10 } },{ '-bool' => 'skipover' }], -or => [{ deferrals => { '>=', 10 } },{ '-bool' => 'skipover' }],
}, { columns => 'device' })->as_query }, }, { columns => 'device' })->as_query },
%$where, %$where,
}, { order_by => 'random()', rows => $num_slots }); }, { order_by => 'random()', rows => $num_slots });

2
share/schema_versions/App-Netdisco-DB-41-42-PostgreSQL.sql
View File

@@ -4,7 +4,7 @@ CREATE TABLE "device_skip" (
"backend" text NOT NULL, "backend" text NOT NULL,
"device" inet NOT NULL, "device" inet NOT NULL,
"action" text NOT NULL, "action" text NOT NULL,
"failures" integer DEFAULT 0, "deferrals" integer DEFAULT 0,
"skipover" boolean DEFAULT false, "skipover" boolean DEFAULT false,
PRIMARY KEY ("backend", "device", "action") PRIMARY KEY ("backend", "device", "action")
); );