From da4e15e219563899acd565650d3ea5261fed9451 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 16 Feb 2018 13:50:08 -0800 Subject: [PATCH] rdbms: tweak var names in LoadMonitor::scaleLoads()/getLagTimes() Also mark the methods as "final" due to their delegation Change-Id: Ie32f53445f749d9a00e77fce43d75830e260c039 --- includes/libs/rdbms/loadmonitor/LoadMonitor.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/includes/libs/rdbms/loadmonitor/LoadMonitor.php b/includes/libs/rdbms/loadmonitor/LoadMonitor.php index 74c7765844..50c878d06b 100644 --- a/includes/libs/rdbms/loadmonitor/LoadMonitor.php +++ b/includes/libs/rdbms/loadmonitor/LoadMonitor.php @@ -81,13 +81,13 @@ class LoadMonitor implements ILoadMonitor { $this->replLogger = $logger; } - public function scaleLoads( array &$weightByServer, $domain ) { + final public function scaleLoads( array &$weightByServer, $domain ) { $serverIndexes = array_keys( $weightByServer ); $states = $this->getServerStates( $serverIndexes, $domain ); - $coefficientsByServer = $states['weightScales']; + $newScalesByServer = $states['weightScales']; foreach ( $weightByServer as $i => $weight ) { - if ( isset( $coefficientsByServer[$i] ) ) { - $weightByServer[$i] = $weight * $coefficientsByServer[$i]; + if ( isset( $newScalesByServer[$i] ) ) { + $weightByServer[$i] = $weight * $newScalesByServer[$i]; } else { // server recently added to config? $host = $this->parent->getServerName( $i ); $this->replLogger->error( __METHOD__ . ": host $host not in cache" ); @@ -95,10 +95,8 @@ class LoadMonitor implements ILoadMonitor { } } - public function getLagTimes( array $serverIndexes, $domain ) { - $states = $this->getServerStates( $serverIndexes, $domain ); - - return $states['lagTimes']; + final public function getLagTimes( array $serverIndexes, $domain ) { + return $this->getServerStates( $serverIndexes, $domain )['lagTimes']; } protected function getServerStates( array $serverIndexes, $domain ) { -- 2.20.1