jenkins-bot has submitted this change and it was merged.
Change subject: Remove use of deprecated LoadBalancer pickRandom
......................................................................
Remove use of deprecated LoadBalancer pickRandom
Change-Id: If28b6dfe7d70827d1c7f7b3604cea2409b6ec483
---
M includes/db/LoadBalancer.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 3358488..857109d 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -167,7 +167,7 @@
#wfDebugLog( 'connect', var_export( $loads, true ) );
# Return a random representative of the remainder
- return $this->pickRandom( $loads );
+ return ArrayUtils::pickRandom( $loads );
}
/**
@@ -236,7 +236,7 @@
$currentLoads = $nonErrorLoads;
while ( count( $currentLoads ) ) {
if ( $wgReadOnly || $this->mAllowLagged ||
$laggedSlaveMode ) {
- $i = $this->pickRandom( $currentLoads );
+ $i = ArrayUtils::pickRandom(
$currentLoads );
} else {
$i = $this->getRandomNonLagged(
$currentLoads, $wiki );
if ( $i === false && count(
$currentLoads ) != 0 ) {
@@ -244,7 +244,7 @@
wfDebugLog( 'replication', "All
slaves lagged. Switch to read-only mode\n" );
$wgReadOnly = 'The database has
been automatically locked ' .
'while the slave
database servers catch up to the master';
- $i = $this->pickRandom(
$currentLoads );
+ $i = ArrayUtils::pickRandom(
$currentLoads );
$laggedSlaveMode = true;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/87608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If28b6dfe7d70827d1c7f7b3604cea2409b6ec483
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
