From 15a38edbc1e192b3a7dc631c955eaf2504191b17 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 16 Feb 2018 08:18:53 +0000
Subject: [PATCH] tune the job picking sql to avoid user jobs ignoring skips

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

diff --git a/Changes b/Changes
index a34760ce..eb1cebea 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.039007 - 2018-02-16
+
+  [ENHANCEMENTS]
+
+  * tune the job picking sql to avoid user jobs ignoring skips
+
 2.039006 - 2018-02-15
 
   [BUG FIXES]
diff --git a/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm b/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
index af999693..d99bbddb 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/TastyJobs.pm
@@ -30,9 +30,8 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
     LEFT OUTER JOIN device_skip ds
       ON (ds.backend = ? AND ds.device = my_jobs.device)
 
-   WHERE my_jobs.username IS NOT NULL
+   WHERE ds.deferrals < ?
       OR (ds.deferrals IS NULL AND ds.last_defer IS NULL)
-      OR ds.deferrals < ?
       OR ds.last_defer <= ( LOCALTIMESTAMP - ?::interval )
 
    ORDER BY job_priority DESC,