From 19c44ae47379669dcc5307c2be3b3376863f144b Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 12 Sep 2016 13:57:22 -0700 Subject: [PATCH] Make safeWaitForMasterPos() use mWaitTimeout instead of hard-coded value Change-Id: Idd5db66f5e7cea9fc3f3a4f47bd38e08e42559f6 --- includes/db/loadbalancer/LoadBalancer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/db/loadbalancer/LoadBalancer.php b/includes/db/loadbalancer/LoadBalancer.php index 42044a7c48..96ae2e73c0 100644 --- a/includes/db/loadbalancer/LoadBalancer.php +++ b/includes/db/loadbalancer/LoadBalancer.php @@ -1662,11 +1662,11 @@ class LoadBalancer { * * @param IDatabase $conn Replica DB * @param DBMasterPos|bool $pos Master position; default: current position - * @param integer $timeout Timeout in seconds + * @param integer|null $timeout Timeout in seconds [optional] * @return bool Success * @since 1.27 */ - public function safeWaitForMasterPos( IDatabase $conn, $pos = false, $timeout = 10 ) { + public function safeWaitForMasterPos( IDatabase $conn, $pos = false, $timeout = null ) { if ( $this->getServerCount() == 1 || !$conn->getLBInfo( 'replica' ) ) { return true; // server is not a replica DB } @@ -1676,6 +1676,7 @@ class LoadBalancer { return false; // something is misconfigured } + $timeout = $timeout ?: $this->mWaitTimeout; $result = $conn->masterPosWait( $pos, $timeout ); if ( $result == -1 || is_null( $result ) ) { $msg = __METHOD__ . ": Timed out waiting on {$conn->getServer()} pos {$pos}"; -- 2.20.1