From af6efc3b06d9f1bc6d72baa0b608f0e42d213787 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 5 Sep 2016 12:19:00 -0700
Subject: [PATCH] Renamed "slave" internal LB/DB info field to "replica"

Change-Id: I46379013ddbdfdf03dbae0c6071e3dc0d960332d
---
 includes/db/Database.php                     | 2 +-
 includes/db/loadbalancer/LBFactoryMulti.php  | 2 +-
 includes/db/loadbalancer/LBFactorySimple.php | 2 +-
 includes/db/loadbalancer/LoadBalancer.php    | 2 +-
 tests/phpunit/includes/db/LBFactoryTest.php  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 4d7f85884d..a011107fd3 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -3228,7 +3228,7 @@ abstract class DatabaseBase implements IDatabase {
 	 */
 	public function getApproximateLagStatus() {
 		return [
-			'lag'   => $this->getLBInfo( 'slave' ) ? $this->getLag() : 0,
+			'lag'   => $this->getLBInfo( 'replica' ) ? $this->getLag() : 0,
 			'since' => microtime( true )
 		];
 	}
diff --git a/includes/db/loadbalancer/LBFactoryMulti.php b/includes/db/loadbalancer/LBFactoryMulti.php
index c0f6509a75..17e01b914a 100644
--- a/includes/db/loadbalancer/LBFactoryMulti.php
+++ b/includes/db/loadbalancer/LBFactoryMulti.php
@@ -353,7 +353,7 @@ class LBFactoryMulti extends LBFactory {
 				}
 				$master = false;
 			} else {
-				$serverInfo['slave'] = true;
+				$serverInfo['replica'] = true;
 			}
 			if ( isset( $this->templateOverridesByServer[$serverName] ) ) {
 				$serverInfo = $this->templateOverridesByServer[$serverName] + $serverInfo;
diff --git a/includes/db/loadbalancer/LBFactorySimple.php b/includes/db/loadbalancer/LBFactorySimple.php
index c06b5b18f7..262b0d9b9e 100644
--- a/includes/db/loadbalancer/LBFactorySimple.php
+++ b/includes/db/loadbalancer/LBFactorySimple.php
@@ -54,7 +54,7 @@ class LBFactorySimple extends LBFactory {
 				if ( $i == 0 ) {
 					$server['master'] = true;
 				} else {
-					$server['slave'] = true;
+					$server['replica'] = true;
 				}
 				$server += [ 'flags' => DBO_DEFAULT ];
 			}
diff --git a/includes/db/loadbalancer/LoadBalancer.php b/includes/db/loadbalancer/LoadBalancer.php
index d3a2902a00..80ecd70730 100644
--- a/includes/db/loadbalancer/LoadBalancer.php
+++ b/includes/db/loadbalancer/LoadBalancer.php
@@ -1670,7 +1670,7 @@ class LoadBalancer {
 	 * @since 1.27
 	 */
 	public function safeWaitForMasterPos( IDatabase $conn, $pos = false, $timeout = 10 ) {
-		if ( $this->getServerCount() == 1 || !$conn->getLBInfo( 'slave' ) ) {
+		if ( $this->getServerCount() == 1 || !$conn->getLBInfo( 'replica' ) ) {
 			return true; // server is not a replica DB
 		}
 
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index 3562ed822a..24c5d9296d 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -107,7 +107,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 			$wgDBserver, $dbw->getLBInfo( 'clusterMasterHost' ), 'cluster master set' );
 
 		$dbr = $lb->getConnection( DB_SLAVE );
-		$this->assertTrue( $dbr->getLBInfo( 'slave' ), 'slave shows as slave' );
+		$this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' );
 		$this->assertEquals(
 			$wgDBserver, $dbr->getLBInfo( 'clusterMasterHost' ), 'cluster master set' );
 
@@ -145,7 +145,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' );
 
 		$dbr = $lb->getConnection( DB_SLAVE );
-		$this->assertTrue( $dbr->getLBInfo( 'slave' ), 'slave shows as slave' );
+		$this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' );
 
 		$factory->shutdown();
 		$lb->closeAll();
-- 
2.20.1