jenkins-bot has submitted this change and it was merged.
Change subject: Removed maximumPeriodicTaskSeconds hack; now unused
......................................................................
Removed maximumPeriodicTaskSeconds hack; now unused
Change-Id: Ib4308990c21b0118f00fde72412868993c5ce056
---
M includes/jobqueue/JobQueueRedis.php
1 file changed, 1 insertion(+), 16 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/JobQueueRedis.php
b/includes/jobqueue/JobQueueRedis.php
index f5a266e..d81a292 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -72,12 +72,6 @@
protected $key;
/**
- * @var null|int maximum seconds between execution of periodic tasks.
Used to speed up
- * testing but should otherwise be left unset.
- */
- protected $maximumPeriodicTaskSeconds;
-
- /**
* @params include:
* - redisConfig : An array of parameters to
RedisConnectionPool::__construct().
* Note that the serializer option is ignored as
"none" is always used.
@@ -85,10 +79,6 @@
* If a hostname is specified but no port, the
standard port number
* 6379 will be used. Required.
* - compression : The type of compression to use; one of (none,gzip).
- * - maximumPeriodicTaskSeconds : Maximum seconds between check
periodic tasks. Set to
- * force faster execution of periodic tasks for
inegration tests that
- * rely on checkDelay. Without this the integration
tests are very very
- * slow. This really shouldn't be set in production.
* @param array $params
*/
public function __construct( array $params ) {
@@ -97,8 +87,6 @@
$this->server = $params['redisServer'];
$this->compression = isset( $params['compression'] ) ?
$params['compression'] : 'none';
$this->redisPool = RedisConnectionPool::singleton(
$params['redisConfig'] );
- $this->maximumPeriodicTaskSeconds = isset(
$params['maximumPeriodicTaskSeconds'] ) ?
- $params['maximumPeriodicTaskSeconds'] : null;
}
protected function supportedOrders() {
@@ -738,10 +726,7 @@
}
$period = min( $periods );
$period = max( $period, 30 ); // sanity
- // Support override for faster testing
- if ( $this->maximumPeriodicTaskSeconds !== null ) {
- $period = min( $period,
$this->maximumPeriodicTaskSeconds );
- }
+
return array(
'recyclePruneAndUndelayJobs' => array(
'callback' => array( $this,
'recyclePruneAndUndelayJobs' ),
--
To view, visit https://gerrit.wikimedia.org/r/129834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4308990c21b0118f00fde72412868993c5ce056
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
