From ea592c6b28a1ae83686a99a1d55801fb01cfc949 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 18 Apr 2018 21:57:26 +0100
Subject: [PATCH] #398 user submitted jobs are run regardless of max deferrals

---
 Changes                                         | 1 +
 lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm | 2 +-
 lib/App/Netdisco/JobQueue/PostgreSQL.pm         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 101d9aea..efbb7e27 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@
 
   * #392 fix heuristic neighbour detection
   * #393 avoid 'modification of readonly variable' error in netmap
+  * #398 user submitted jobs are run regardless of max deferrals
   * clean up check_mac() interface (ml-cms)
 
 2.039021 - 2018-04-10
diff --git a/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm b/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
index f1fb486a..d18f5fa2 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
@@ -29,7 +29,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
     LEFT OUTER JOIN device_skip ds
       ON (ds.backend = ? AND ds.device = my_jobs.device)
 
-   WHERE ds.deferrals < ?
+   WHERE ((ds.deferrals < ?) OR my_jobs.username IS NOT NULL)
       OR (ds.deferrals IS NULL AND ds.last_defer IS NULL)
       OR ds.last_defer <= ( LOCALTIMESTAMP - ?::interval )
 
diff --git a/lib/App/Netdisco/JobQueue/PostgreSQL.pm b/lib/App/Netdisco/JobQueue/PostgreSQL.pm
index f789db83..a16913f0 100644
--- a/lib/App/Netdisco/JobQueue/PostgreSQL.pm
+++ b/lib/App/Netdisco/JobQueue/PostgreSQL.pm
@@ -241,7 +241,7 @@ sub jq_complete {
 
   # now that SNMP connect failures are deferrals and not errors, any complete
   # status, whether success or failure, indicates an SNMP connect. reset the
-  # connection failures counter to forget oabout occasional connect glitches.
+  # connection failures counter to forget about occasional connect glitches.
 
   try {
     schema('netdisco')->txn_do(sub {