Cleanup some comments related to DB replication

Change-Id: Icaaa5144beaedfebb88530480733a1e916c935fb

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 6c932d2..b3abe7c 100644 (file)
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -861,7 +861,7 @@ class MediaWiki {
                $this->performRequest();
 
                // GUI-ify and stash the page output in MediaWiki::doPreOutputCommit() while
-               // ChronologyProtector synchronizes DB positions or slaves accross all datacenters.
+               // ChronologyProtector synchronizes DB positions or replicas accross all datacenters.
                $buffer = null;
                $outputWork = function () use ( $output, &$buffer ) {
                        if ( $buffer === null ) {

diff --git a/includes/jobqueue/jobs/ClearUserWatchlistJob.php b/includes/jobqueue/jobs/ClearUserWatchlistJob.php
index 3e8b2ad..77adfa1 100644 (file)
--- a/includes/jobqueue/jobs/ClearUserWatchlistJob.php
+++ b/includes/jobqueue/jobs/ClearUserWatchlistJob.php
@@ -53,7 +53,7 @@ class ClearUserWatchlistJob extends Job {
 
                // Wait before lock to try to reduce time waiting in the lock.
                if ( !$loadBalancer->safeWaitForMasterPos( $dbr ) ) {
-                       $this->setLastError( 'Timed out while waiting for slave to catch up before lock' );
+                       $this->setLastError( 'Timed out waiting for replica to catch up before lock' );
                        return false;
                }
 
@@ -66,7 +66,7 @@ class ClearUserWatchlistJob extends Job {
                }
 
                if ( !$loadBalancer->safeWaitForMasterPos( $dbr ) ) {
-                       $this->setLastError( 'Timed out while waiting for slave to catch up within lock' );
+                       $this->setLastError( 'Timed out waiting for replica to catch up within lock' );
                        return false;
                }
 

diff --git a/includes/watcheditem/WatchedItemStore.php b/includes/watcheditem/WatchedItemStore.php
index 35e824e..1b37968 100644 (file)
--- a/includes/watcheditem/WatchedItemStore.php
+++ b/includes/watcheditem/WatchedItemStore.php
@@ -693,7 +693,7 @@ class WatchedItemStore implements WatchedItemStoreInterface, StatsdAwareInterfac
                }
                // Update process cache to ensure skin doesn't claim that the current
                // page is unwatched in the response of action=watch itself (T28292).
-               // This would otherwise be re-queried from a slave by isWatched().
+               // This would otherwise be re-queried from a replica by isWatched().
                foreach ( $items as $item ) {
                        $this->cache( $item );
                }

diff --git a/maintenance/migrateArchiveText.php b/maintenance/migrateArchiveText.php
index e9beaa3..60dbea1 100644 (file)
--- a/maintenance/migrateArchiveText.php
+++ b/maintenance/migrateArchiveText.php
@@ -143,7 +143,7 @@ class MigrateArchiveText extends LoggedUpdateMaintenance {
                        }
 
                        $this->output( "... $last\n" );
-                       // $this->commitTransaction() already waited for slaves, no need to re-wait here.
+                       // $this->commitTransaction() already waited for replication; no need to re-wait here
                }
 
                $this->output( "Completed ar_text migration, $count rows updated, $errors missing data.\n" );

diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php
index 235b37f..284db2c 100644 (file)
--- a/maintenance/resetUserTokens.php
+++ b/maintenance/resetUserTokens.php
@@ -68,7 +68,6 @@ class ResetUserTokens extends Maintenance {
                }
 
                // We list user by user_id from one of the replica DBs
-               // We list user by user_id from one of the slave database
                $dbr = $this->getDB( DB_REPLICA );
 
                $where = [];