Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57733
Change subject: Wait for slaves to catch up on correct cluster
......................................................................
Wait for slaves to catch up on correct cluster
Change-Id: I8c9597ffde511f54949fb931c2e2c31a492f794b
---
M maintenance/archiveFeedback.php
M maintenance/legacyToShard.php
M maintenance/setArchiveDate.php
3 files changed, 9 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/33/57733/1
diff --git a/maintenance/archiveFeedback.php b/maintenance/archiveFeedback.php
index dc78c10..765df31 100644
--- a/maintenance/archiveFeedback.php
+++ b/maintenance/archiveFeedback.php
@@ -52,7 +52,8 @@
* it works similar to any other action plus caches will update nicely.
*/
public function execute() {
- global $wgArticleFeedbackAutoArchiveEnabled;
+ global $wgArticleFeedbackv5Cluster,
$wgArticleFeedbackAutoArchiveEnabled;
+
if ( !$wgArticleFeedbackAutoArchiveEnabled ) {
$this->output( 'IMPORTANT! Auto-archive is currently
disabled. To enable, set $wgArticleFeedbackAutoArchiveEnabled = true.'."\n" );
} else {
@@ -101,7 +102,7 @@
$this->output( "--moved to entry
#$feedback->aft_id\n" );
}
- wfWaitForSlaves();
+ wfWaitForSlaves( false, false,
$wgArticleFeedbackv5Cluster );
if ( $break ) {
break;
diff --git a/maintenance/legacyToShard.php b/maintenance/legacyToShard.php
index c45927b..5034a18 100644
--- a/maintenance/legacyToShard.php
+++ b/maintenance/legacyToShard.php
@@ -46,6 +46,8 @@
* @return bool
*/
protected function doDBUpdates() {
+ global $wgArticleFeedbackv5Cluster;
+
$dbr = $this->getDB( DB_SLAVE );
if ( !$dbr->tableExists( 'aft_article_feedback' ) ) {
// not necessary to run, there is no source data
@@ -61,7 +63,7 @@
$continue = 0;
while ( $continue !== null ) {
$continue = $this->moveBatch( $continue );
- wfWaitForSlaves();
+ wfWaitForSlaves( false, false,
$wgArticleFeedbackv5Cluster );
if ( $continue ) {
$this->output( "--moved to entry #$continue\n"
);
diff --git a/maintenance/setArchiveDate.php b/maintenance/setArchiveDate.php
index a9096c8..6c60a7b 100644
--- a/maintenance/setArchiveDate.php
+++ b/maintenance/setArchiveDate.php
@@ -48,6 +48,8 @@
* @return bool
*/
protected function doDBUpdates() {
+ global $wgArticleFeedbackv5Cluster;
+
$this->output( "Fixing archive dates.\n" );
/**
@@ -92,7 +94,7 @@
$next = $offset;
}
- wfWaitForSlaves();
+ wfWaitForSlaves( false, false,
$wgArticleFeedbackv5Cluster );
if ( $break ) {
break;
--
To view, visit https://gerrit.wikimedia.org/r/57733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c9597ffde511f54949fb931c2e2c31a492f794b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
