jenkins-bot has submitted this change and it was merged.
Change subject: Try to make sure jobs will not get pushed twice on failures
......................................................................
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
---
M includes/job/JobQueueFederated.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/job/JobQueueFederated.php
b/includes/job/JobQueueFederated.php
index d788c98..4257da4 100644
--- a/includes/job/JobQueueFederated.php
+++ b/includes/job/JobQueueFederated.php
@@ -253,7 +253,7 @@
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 @@
} 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() );
--
To view, visit https://gerrit.wikimedia.org/r/89097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id73b34f3500f8aeaf456e6bcac862a1e4832c870
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
