ArielGlenn has submitted this change and it was merged.

Change subject: dumps: get rid of one more eval.php call, correct usage message
......................................................................


dumps: get rid of one more eval.php call, correct usage message

Change-Id: Ic27b1169eb7650df56589faa18721f27664cb0d2
---
M modules/snapshot/files/dumpcentralauth.sh
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/snapshot/files/dumpcentralauth.sh 
b/modules/snapshot/files/dumpcentralauth.sh
index 1f24017..7a3c822 100755
--- a/modules/snapshot/files/dumpcentralauth.sh
+++ b/modules/snapshot/files/dumpcentralauth.sh
@@ -5,7 +5,7 @@
     echo
     echo "  --site     codfw, eqiad, etc"
     echo "  --config   path to configuration file for dump generation"
-    echo "             (default value: 
/backups/dumps/production/confs/wikidump.conf"
+    echo "             (default value: /srv/dumps/confs/wikidump.conf"
     echo "  --dryrun   don't run dump, show what would have been done"
     exit 1
 }
@@ -61,7 +61,7 @@
 fi
 
 wiki=`grep $dbcluster "$dbphpfile" | grep wiki | head -1 | mawk -F"'" ' { 
print $2 }'`
-host=`echo "echo 
wfGetLB()->getServerName(wfGetLB()->getReaderIndex(false,'$wiki')); " | php 
"$multiversionscript" eval.php $wiki`
+host=`php -q "$multiversionscript" getSlaveServer.php --wiki="$wiki" 
--group=dump`
 if [ -z "$dbcluster" -o -z "$wiki" -o -z "$host" ]; then
     echo "can't locate db server for centralauth, exiting."
     exit 1

-- 
To view, visit https://gerrit.wikimedia.org/r/230767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic27b1169eb7650df56589faa18721f27664cb0d2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to