Merge pull request #11162 from notbakaneko/feature/remove-scores-sepa…

…rate-connection

Prevent score removal jobs from overlapping

app/Jobs/RemoveBeatmapsetBestScores.php

@@ -12,11 +12,13 @@
 use App\Models\Score\Best\Model;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 
 class RemoveBeatmapsetBestScores implements ShouldQueue
 {
-    use Queueable, SerializesModels;
+    use InteractsWithQueue, Queueable, SerializesModels;
 
     public $timeout = 36000;
     public $beatmapset;
@@ -78,4 +80,9 @@ public function handle()
             }
         }
     }
+
+    public function middleware(): array
+    {
+        return [new WithoutOverlapping((string) $this->beatmapset->getKey(), $this->timeout, $this->timeout)];
+    }
 }

app/Jobs/RemoveBeatmapsetSoloScores.php

@@ -14,10 +14,12 @@
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
 
 class RemoveBeatmapsetSoloScores implements ShouldQueue
 {
-    use Queueable;
+    use InteractsWithQueue, Queueable;
 
     public $timeout = 36000;
 
@@ -59,6 +61,11 @@ public function handle()
             ->chunkById(1000, fn ($scores) => $this->deleteScores($scores));
     }
 
+    public function middleware(): array
+    {
+        return [new WithoutOverlapping((string) $this->beatmapsetId, $this->timeout, $this->timeout)];
+    }
+
     private function deleteScores(Collection $scores): void
     {
         $ids = $scores->pluck('id')->all();

config/queue.php

@@ -30,7 +30,6 @@
     */
 
     'connections' => [
-
         'sync' => [
             'driver' => 'sync',
         ],
@@ -42,10 +41,11 @@
             'retry_after' => 305,
         ],
 
+        // retry_after has to be longer than the job timeout; 5s added to allow time for workers to be killed.
         'redis' => [
             'driver' => 'redis',
             'queue' => 'default',
-            'retry_after' => 305, // our longest job timeout is 5m, plus 5s to allow time for workers to be killed
+            'retry_after' => 305, // RegenerateBeatmapsetCover (300s),
         ],
     ],