Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190781
Change subject: Removed odd "partitionsNoPush" setting to simplify the code
......................................................................
Removed odd "partitionsNoPush" setting to simplify the code
Change-Id: Id105e7e60fae4b8a30cda74a45597a2a2e548a91
---
M includes/jobqueue/JobQueueFederated.php
1 file changed, 8 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/81/190781/1
diff --git a/includes/jobqueue/JobQueueFederated.php
b/includes/jobqueue/JobQueueFederated.php
index 4186204..1e0dc2a 100644
--- a/includes/jobqueue/JobQueueFederated.php
+++ b/includes/jobqueue/JobQueueFederated.php
@@ -49,8 +49,6 @@
class JobQueueFederated extends JobQueue {
/** @var HashRing */
protected $partitionRing;
- /** @var HashRing */
- protected $partitionPushRing;
/** @var array (partition name => JobQueue) reverse sorted by weight */
protected $partitionQueues = array();
@@ -74,8 +72,6 @@
* These configuration arrays are passed to
JobQueue::factory().
* The options set here are overridden by
those passed to this
* the federated queue itself (e.g. 'order'
and 'claimTTL').
- * - partitionsNoPush : List of partition names that can handle
pop() but not push().
- * This can be used to migrate away from a
certain partition.
* - maxPartitionsTry : Maximum number of times to attempt job
insertion using
* different partition queues. This improves
availability
* during failure, at the cost of added
latency and somewhat
@@ -96,17 +92,10 @@
// Get the full partition map
$partitionMap = $params['partitionsBySection'][$section];
arsort( $partitionMap, SORT_NUMERIC );
- // Get the partitions jobs can actually be pushed to
- $partitionPushMap = $partitionMap;
- if ( isset( $params['partitionsNoPush'] ) ) {
- foreach ( $params['partitionsNoPush'] as $partition ) {
- unset( $partitionPushMap[$partition] );
- }
- }
// Get the config to pass to merge into each partition queue
config
$baseConfig = $params;
foreach ( array( 'class', 'sectionsByWiki', 'maxPartitionsTry',
- 'partitionsBySection', 'configByPartition',
'partitionsNoPush' ) as $o
+ 'partitionsBySection', 'configByPartition', ) as $o
) {
unset( $baseConfig[$o] ); // partition queue doesn't
care about this
}
@@ -120,12 +109,6 @@
}
// Ring of all partitions
$this->partitionRing = new HashRing( $partitionMap );
- // Get the ring of partitions to push jobs into
- if ( count( $partitionPushMap ) === count( $partitionMap ) ) {
- $this->partitionPushRing = clone $this->partitionRing;
// faster
- } else {
- $this->partitionPushRing = new HashRing(
$partitionPushMap );
- }
// Aggregate cache some per-queue values if there are multiple
partition queues
$this->cache = count( $partitionMap ) > 1 ? wfGetMainCache() :
new EmptyBagOStuff();
}
@@ -216,7 +199,7 @@
protected function doBatchPush( array $jobs, $flags ) {
// Local ring variable that may be changed to point to a new
ring on failure
- $partitionRing = $this->partitionPushRing;
+ $partitionRing = $this->partitionRing;
// Try to insert the jobs and update $partitionsTry on any
failures.
// Retry to insert any remaning jobs again, ignoring the bad
partitions.
$jobsLeft = $jobs;
@@ -361,12 +344,12 @@
protected function doIsRootJobOldDuplicate( Job $job ) {
$params = $job->getRootJobParams();
$sigature = $params['rootJobSignature'];
- $partition = $this->partitionPushRing->getLiveLocation(
$sigature );
+ $partition = $this->partitionRing->getLiveLocation( $sigature );
try {
return
$this->partitionQueues[$partition]->doIsRootJobOldDuplicate( $job );
} catch ( JobQueueError $e ) {
- if ( $this->partitionPushRing->ejectFromLiveRing(
$partition, 5 ) ) {
- $partition =
$this->partitionPushRing->getLiveLocation( $sigature );
+ if ( $this->partitionRing->ejectFromLiveRing(
$partition, 5 ) ) {
+ $partition =
$this->partitionRing->getLiveLocation( $sigature );
return
$this->partitionQueues[$partition]->doIsRootJobOldDuplicate( $job );
}
}
@@ -377,12 +360,12 @@
protected function doDeduplicateRootJob( Job $job ) {
$params = $job->getRootJobParams();
$sigature = $params['rootJobSignature'];
- $partition = $this->partitionPushRing->getLiveLocation(
$sigature );
+ $partition = $this->partitionRing->getLiveLocation( $sigature );
try {
return
$this->partitionQueues[$partition]->doDeduplicateRootJob( $job );
} catch ( JobQueueError $e ) {
- if ( $this->partitionPushRing->ejectFromLiveRing(
$partition, 5 ) ) {
- $partition =
$this->partitionPushRing->getLiveLocation( $sigature );
+ if ( $this->partitionRing->ejectFromLiveRing(
$partition, 5 ) ) {
+ $partition =
$this->partitionRing->getLiveLocation( $sigature );
return
$this->partitionQueues[$partition]->doDeduplicateRootJob( $job );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/190781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id105e7e60fae4b8a30cda74a45597a2a2e548a91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
