ArielGlenn has submitted this change and it was merged.
Change subject: fix up rsync args for datset1001 rsync to labs
......................................................................
fix up rsync args for datset1001 rsync to labs
Bug: T128945
Change-Id: I0e3c5033b5a9795eef4693c440f44ca3cbd810a3
---
M modules/dataset/files/labs/labs-rsync-cron.sh
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dataset/files/labs/labs-rsync-cron.sh
b/modules/dataset/files/labs/labs-rsync-cron.sh
index 78e73ba..5d45ba5 100644
--- a/modules/dataset/files/labs/labs-rsync-cron.sh
+++ b/modules/dataset/files/labs/labs-rsync-cron.sh
@@ -1,22 +1,22 @@
#!/bin/bash
desthost="labstore1003.eqiad.wmnet"
otherdir="/data/xmldatadumps/public/other"
-bwlimit=50000
+bwlimit="--bwlimit=50000"
do_rsync (){
srcdir=$1
destdir=$2
- running=`pgrep -u root -f -x "/usr/bin/rsync -rlpt $bwlimit
${otherdir}/${srcdir} ${desthost}::dumps/${destdir}"`
+ running=`pgrep -u root -f -x "/usr/bin/rsync -rlptqgo $bwlimit
${otherdir}/${srcdir} ${desthost}::dumps/${destdir}"`
if [ -z "$running" ]; then
- /usr/bin/rsync -rlpt "$bwlimit" "${otherdir}/${srcdir}"
"${desthost}::dumps/${destdir}"
+ /usr/bin/rsync -rlptqgo "$bwlimit" "${otherdir}/${srcdir}"
"${desthost}::dumps/${destdir}"
fi
}
-# fixme these are wrong for sure, so I need to figure out the 'right' thing
here
+
running=`pgrep -u root -f "python /usr/local/bin/wmfdumpsmirror.py
--dest_hostname labstore1003.eqiad.wmnet"`
if [ -z "$running" ]; then
- python /usr/local/bin/wmfdumpsmirror.py --dest_hostname
labstore1003.eqiad.wmnet --sourcedir /data/xmldatadumps/public --destdir
dumps/public --filesperjob 50 --sizeperjob 5G --workercount 1 --rsynclist
rsync-filelist-last-3-good.txt.rsync --rsyncargs -rlptq,--bwlimit=50000
+ python /usr/local/bin/wmfdumpsmirror.py --dest_hostname
labstore1003.eqiad.wmnet --sourcedir /data/xmldatadumps/public --destdir
dumps/public --filesperjob 50 --sizeperjob 5G --workercount 1 --rsynclist
rsync-filelist-last-3-good.txt.rsync --rsyncargs -rlptqgo,--bwlimit=50000
fi
# fixme need to ensure ${desthost}::dumps/public/wikidatawiki/entities/ exists
--
To view, visit https://gerrit.wikimedia.org/r/275801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e3c5033b5a9795eef4693c440f44ca3cbd810a3
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
