Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/337669 )
Change subject: Type check the APC value in LoadBalancer::doWait()
......................................................................
Type check the APC value in LoadBalancer::doWait()
Change-Id: If00cd5fd2ace828ce03824ec7b5735de7d950dec
(cherry picked from commit 473b200a7d49ee25f2838cec84c6833b71d05fa2)
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/69/337669/1
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index baac3d0..fbdccc7 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -488,7 +488,10 @@
$key = $this->srvCache->makeGlobalKey( __CLASS__,
'last-known-pos', $server );
/** @var DBMasterPos $knownReachedPos */
$knownReachedPos = $this->srvCache->get( $key );
- if ( $knownReachedPos && $knownReachedPos->hasReached(
$this->mWaitForPos ) ) {
+ if (
+ $knownReachedPos instanceof DBMasterPos &&
+ $knownReachedPos->hasReached( $this->mWaitForPos )
+ ) {
$this->replLogger->debug( __METHOD__ .
": replica DB $server known to be caught up
(pos >= $knownReachedPos)." );
return true;
--
To view, visit https://gerrit.wikimedia.org/r/337669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If00cd5fd2ace828ce03824ec7b5735de7d950dec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.11
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
