Try to make sure jobs will not get pushed twice on failures

* Some queues like the DB one, might split up batches into chunks
  which we do not want when used by federated queues (it already
  manages chunking anyway). If only X of Y got inserted, then they
  would all get inserted into another partition, causing duplicates

Change-Id: Id73b34f3500f8aeaf456e6bcac862a1e4832c870

diff --git a/includes/job/JobQueueFederated.php b/includes/job/JobQueueFederated.php
index d788c98..4257da4 100644 (file)
--- a/includes/job/JobQueueFederated.php
+++ b/includes/job/JobQueueFederated.php
@@ -253,7 +253,7 @@ class JobQueueFederated extends JobQueue {
                foreach ( $uJobsByPartition as $partition => $jobBatch ) {
                        $queue = $this->partitionQueues[$partition];
                        try {
-                               $ok = $queue->doBatchPush( $jobBatch, $flags );
+                               $ok = $queue->doBatchPush( $jobBatch, $flags | self::QOS_ATOMIC );
                        } catch ( JobQueueError $e ) {
                                $ok = false;
                                wfDebugLog( 'exception', $e->getLogMessage() );
@@ -274,7 +274,7 @@ class JobQueueFederated extends JobQueue {
                        } else {
                                $queue = $this->partitionQueues[$partition];
                                try {
-                                       $ok = $queue->doBatchPush( $jobBatch, $flags );
+                                       $ok = $queue->doBatchPush( $jobBatch, $flags | self::QOS_ATOMIC );
                                } catch ( JobQueueError $e ) {
                                        $ok = false;
                                        wfDebugLog( 'exception', $e->getLogMessage() );