From fe7bd754ee6c0c606b8bd9af7d20c6abce2c693e Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Thu, 14 Oct 2021 21:35:14 +0200 Subject: [PATCH] objectcache: Change variable name from master to primary Change-Id: I3574ea348f32ccd289a0b4158fe93b5cb48ddffa --- includes/objectcache/SqlBagOStuff.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php index 2087cef61de..1c5e56b69e0 100644 --- a/includes/objectcache/SqlBagOStuff.php +++ b/includes/objectcache/SqlBagOStuff.php @@ -1861,14 +1861,14 @@ class SqlBagOStuff extends MediumSpecificBagOStuff { try { // Wait for any replica DBs to catch up - $masterPos = $lb->getPrimaryPos(); - if ( !$masterPos ) { + $primaryPos = $lb->getPrimaryPos(); + if ( !$primaryPos ) { return true; // not applicable } $loop = new WaitConditionLoop( - static function () use ( $lb, $masterPos ) { - return $lb->waitForAll( $masterPos, 1 ); + static function () use ( $lb, $primaryPos ) { + return $lb->waitForAll( $primaryPos, 1 ); }, $this->syncTimeout, $this->busyCallbacks