jenkins-bot has submitted this change and it was merged.
Change subject: Remove useless LoadBalancer::parentInfo() method and calls
......................................................................
Remove useless LoadBalancer::parentInfo() method and calls
Change-Id: I3550d1249c63ee5bec51dd343b3e26b515c4827e
---
M includes/db/loadbalancer/LBFactoryMulti.php
M includes/db/loadbalancer/LBFactorySimple.php
M includes/db/loadbalancer/LoadBalancer.php
3 files changed, 0 insertions(+), 13 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/loadbalancer/LBFactoryMulti.php
b/includes/db/loadbalancer/LBFactoryMulti.php
index e56631d..e860840 100644
--- a/includes/db/loadbalancer/LBFactoryMulti.php
+++ b/includes/db/loadbalancer/LBFactoryMulti.php
@@ -254,7 +254,6 @@
$section = $this->getSectionForWiki( $wiki );
if ( !isset( $this->mainLBs[$section] ) ) {
$lb = $this->newMainLB( $wiki );
- $lb->parentInfo( [ 'id' => "main-$section" ] );
$this->chronProt->initLB( $lb );
$this->mainLBs[$section] = $lb;
}
@@ -296,7 +295,6 @@
public function getExternalLB( $cluster, $wiki = false ) {
if ( !isset( $this->extLBs[$cluster] ) ) {
$this->extLBs[$cluster] = $this->newExternalLB(
$cluster, $wiki );
- $this->extLBs[$cluster]->parentInfo( [ 'id' =>
"ext-$cluster" ] );
$this->chronProt->initLB( $this->extLBs[$cluster] );
}
diff --git a/includes/db/loadbalancer/LBFactorySimple.php
b/includes/db/loadbalancer/LBFactorySimple.php
index 4632b0a..b6fb0d2 100644
--- a/includes/db/loadbalancer/LBFactorySimple.php
+++ b/includes/db/loadbalancer/LBFactorySimple.php
@@ -95,7 +95,6 @@
public function getMainLB( $wiki = false ) {
if ( !isset( $this->mainLB ) ) {
$this->mainLB = $this->newMainLB( $wiki );
- $this->mainLB->parentInfo( [ 'id' => 'main' ] );
$this->chronProt->initLB( $this->mainLB );
}
@@ -125,7 +124,6 @@
public function getExternalLB( $cluster, $wiki = false ) {
if ( !isset( $this->extLBs[$cluster] ) ) {
$this->extLBs[$cluster] = $this->newExternalLB(
$cluster, $wiki );
- $this->extLBs[$cluster]->parentInfo( [ 'id' =>
"ext-$cluster" ] );
$this->chronProt->initLB( $this->extLBs[$cluster] );
}
diff --git a/includes/db/loadbalancer/LoadBalancer.php
b/includes/db/loadbalancer/LoadBalancer.php
index 17b1728..42044a7 100644
--- a/includes/db/loadbalancer/LoadBalancer.php
+++ b/includes/db/loadbalancer/LoadBalancer.php
@@ -178,15 +178,6 @@
}
/**
- * Get or set arbitrary data used by the parent object, usually an
LBFactory
- * @param mixed $x
- * @return mixed
- */
- public function parentInfo( $x = null ) {
- return wfSetVar( $this->mParentInfo, $x );
- }
-
- /**
* @param array $loads
* @param bool|string $wiki Wiki to get non-lagged for
* @param int $maxLag Restrict the maximum allowed lag to this many
seconds
--
To view, visit https://gerrit.wikimedia.org/r/309914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3550d1249c63ee5bec51dd343b3e26b515c4827e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
