[MediaWiki-commits] [Gerrit] Made recent changes purge jobs bail more aggressively - change (mediawiki/core)

2015-07-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Made recent changes purge jobs bail more aggressively
..


Made recent changes purge jobs bail more aggressively

* This should handle unusual spikes better

Bug: T104670
Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
---
M includes/jobqueue/jobs/RecentChangesUpdateJob.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php 
b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
index e86d914..d6fa26b 100644
--- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
+++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
@@ -75,11 +75,13 @@
$lockKey = wfWikiID() . ':recentchanges-prune';
 
$dbw = wfGetDB( DB_MASTER );
-   if ( !$dbw-lock( $lockKey, __METHOD__, 1 ) ) {
+   if ( !$dbw-lockIsFree( $lockKey, __METHOD__ )
+   || !$dbw-lock( $lockKey, __METHOD__, 1 )
+   ) {
return; // already in progress
}
-   $batchSize = 100; // Avoid slave lag
 
+   $batchSize = 100; // avoid slave lag
$cutoff = $dbw-timestamp( time() - $wgRCMaxAge );
do {
$rcIds = $dbw-selectFieldValues( 'recentchanges',

-- 
To view, visit https://gerrit.wikimedia.org/r/222626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Made recent changes purge jobs bail more aggressively - change (mediawiki/core)

2015-07-03 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222626

Change subject: Made recent changes purge jobs bail more aggressively
..

Made recent changes purge jobs bail more aggressively

* This should handle unusual spikes better

Bug: T104670
Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
---
M includes/jobqueue/jobs/RecentChangesUpdateJob.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/222626/1

diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php 
b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
index e86d914..d6fa26b 100644
--- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
+++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
@@ -75,11 +75,13 @@
$lockKey = wfWikiID() . ':recentchanges-prune';
 
$dbw = wfGetDB( DB_MASTER );
-   if ( !$dbw-lock( $lockKey, __METHOD__, 1 ) ) {
+   if ( !$dbw-lockIsFree( $lockKey, __METHOD__ )
+   || !$dbw-lock( $lockKey, __METHOD__, 1 )
+   ) {
return; // already in progress
}
-   $batchSize = 100; // Avoid slave lag
 
+   $batchSize = 100; // avoid slave lag
$cutoff = $dbw-timestamp( time() - $wgRCMaxAge );
do {
$rcIds = $dbw-selectFieldValues( 'recentchanges',

-- 
To view, visit https://gerrit.wikimedia.org/r/222626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits