Deduplicate index jobs

Author: kraih

lib/Cavil/Command/unpack.pm

@@ -31,8 +31,8 @@ sub run ($self, @args) {
     $minion->unlock("processing_pkg_$id");
   }
 
-  my $job = $app->packages->unpack($id);
-  print STDOUT "Triggered unpack job $job\n";
+  if   (my $job = $app->packages->unpack($id)) { print STDOUT "Triggered unpack job $job\n" }
+  else                                         { print STDOUT "Unpacking already in progress\n" }
 }
 
 1;

lib/Cavil/Model/Packages.pm

@@ -543,8 +543,13 @@ sub _check_field ($self, $field, $id) {
 }
 
 sub _enqueue ($self, $task, $id, $priority = 5, $parents = [], $delay = 0) {
+  my $minion = $self->minion;
+
+  # Deduplicate jobs for same package
+  return undef if $self->minion->jobs({tasks => [$task], states => ['inactive'], notes => ["pkg_$id"]})->total;
+
   my $pkg = $self->find($id);
-  return $self->minion->enqueue(
+  return $minion->enqueue(
     $task => [$id] => {
       delay    => $delay,
       parents  => $parents,

t/command_unpack.t

@@ -48,6 +48,21 @@ subtest 'Unpack' => sub {
     is $app->minion->jobs({tasks => ['unpack']})->total, 2, 'two unpack jobs';
   };
 
+  subtest 'Unpacking in progress' => sub {
+    my $buffer = '';
+    {
+      open my $handle, '>', \$buffer;
+      local *STDOUT = $handle;
+      $app->start('unpack', '2');
+    }
+    like $buffer, qr/Unpacking already in progress/, 'in progress';
+    is $app->minion->jobs({tasks => ['unpack']})->total, 2, 'two unpack jobs';
+  };
+
+  my $worker = $app->minion->worker->register;
+  my $job    = $worker->dequeue(0);
+  $job->fail('Something went wrong');
+
   subtest 'Unlock failed prior attempt' => sub {
     is $app->minion->jobs({tasks => ['unpack']})->total, 2, 'two unpack jobs';
     $minion->lock('processing_pkg_2', 172800);

t/manual_review.t

@@ -241,7 +241,14 @@ subtest 'Reindex (with updated stats)' => sub {
 
   $t->app->minion->enqueue('pattern_stats');
   $t->app->minion->perform_jobs;
-  $t->app->packages->reindex(1);
+
+  subtest 'Index jobs are deduplicated' => sub {
+    $t->app->packages->reindex(1);
+    is $t->app->minion->jobs({tasks => ['index'], states => ['inactive']})->total, 1, 'one index job';
+    $t->app->packages->reindex(1);
+    is $t->app->minion->jobs({tasks => ['index'], states => ['inactive']})->total, 1, 'one index job';
+  };
+
   $t->get_ok('/reviews/report/1')->status_is(408)->content_like(qr/package being processed/);
   $t->app->minion->perform_jobs;