jenkins-bot has submitted this change and it was merged.
Change subject: Allow server selection when running sql.php
......................................................................
Allow server selection when running sql.php
Change-Id: I2a643eb3a517eba09b80da19158e0957441bcaa5
---
M maintenance/sql.php
1 file changed, 29 insertions(+), 3 deletions(-)
Approvals:
Demon: Looks good to me, approved
Parent5446: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/maintenance/sql.php b/maintenance/sql.php
index 216db93..a628b0b 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -34,16 +34,42 @@
parent::__construct();
$this->mDescription = "Send SQL queries to a MediaWiki
database";
$this->addOption( 'cluster', 'Use an external cluster by name',
false, true );
+ $this->addOption( 'slave', 'Use a slave server (either "any" or
by name)', false, true );
}
public function execute() {
- // Get a DB handle (with this wiki's DB select) from the
appropriate load balancer
+ // Get the appropriate load balancer (for this wiki)
if ( $this->hasOption( 'cluster' ) ) {
$lb = wfGetLBFactory()->getExternalLB(
$this->getOption( 'cluster' ) );
- $dbw = $lb->getConnection( DB_MASTER ); // master for
external LB
} else {
- $dbw = wfGetDB( DB_MASTER ); // master for primary LB
for this wiki
+ $lb = wfGetLB();
}
+ // Figure out which server to use
+ if ( $this->hasOption( 'slave' ) ) {
+ $server = $this->getOption( 'slave' );
+ if ( $server === 'any' ) {
+ $index = DB_SLAVE;
+ } else {
+ $index = null;
+ for ( $i = 0; $i < $lb->getServerCount(); ++$i
) {
+ if ( $lb->getServerName( $i ) ===
$server ) {
+ $index = $i;
+ break;
+ }
+ }
+ if ( $index === null ) {
+ $this->error( "No slave server
configured with the name '$server'.", 1 );
+ }
+ }
+ } else {
+ $index = DB_MASTER;
+ }
+ // Get a DB handle (with this wiki's DB selected) from the
appropriate load balancer
+ $dbw = $lb->getConnection( $index );
+ if ( $this->hasOption( 'slave' ) && $dbw->getLBInfo( 'master' )
!== null ) {
+ $this->error( "The server selected
({$dbw->getServer()}) is not a slave.", 1 );
+ }
+
if ( $this->hasArg( 0 ) ) {
$file = fopen( $this->getArg( 0 ), 'r' );
if ( !$file ) {
--
To view, visit https://gerrit.wikimedia.org/r/64844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a643eb3a517eba09b80da19158e0957441bcaa5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
