ArielGlenn has submitted this change and it was merged.
Change subject: don't use nfs for rsync of pagecount data from dumps hosts
......................................................................
don't use nfs for rsync of pagecount data from dumps hosts
Change-Id: I6ae226e14f776faa76f76d0d6aff3933f03ce775
---
M files/mirror/gluster-rsync-cron.sh
M manifests/misc/download.pp
2 files changed, 4 insertions(+), 21 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/mirror/gluster-rsync-cron.sh
b/files/mirror/gluster-rsync-cron.sh
index 624dc39..29c95ab 100644
--- a/files/mirror/gluster-rsync-cron.sh
+++ b/files/mirror/gluster-rsync-cron.sh
@@ -7,7 +7,7 @@
if [ -z "$running" ]; then
/usr/bin/rsync -a /data/xmldatadumps/public/other/incr
/mnt/glusterpublicdata/public/other/
fi
-running=`pgrep -u root -f -x '/usr/bin/rsync -a
/data/xmldatadumps/public/other/pagecounts-raw /mnt/nfspagecountsdata/`
+running=`pgrep -u root -f -x '/usr/bin/rsync -a
/data/xmldatadumps/public/other/pagecounts-raw labnfs.pmtpa.wmnet::pagecounts`
if [ -z "$running" ]; then
- /usr/bin/rsync -a /data/xmldatadumps/public/other/pagecounts-raw
/mnt/nfspagecountsdata/
+ /usr/bin/rsync -a /data/xmldatadumps/public/other/pagecounts-raw
labnfs.pmtpa.wmnet::pagecounts
fi
diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index 055f974..ae4d2e1 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -166,23 +166,6 @@
}
file {
- '/mnt/nfspagecountsdata':
- ensure => directory,
- owner => "root",
- group => "root",
- mode => 0775;
- }
-
- mount {
- '/mnt/nfspagecountsdata':
- ensure => mounted,
- device => 'labnfs.pmtpa.wmnet:/pagecounts',
- fstype => 'nfs',
- options =>
'bg,rsize=8192,wsize=8192,timeo=14,intr,port=0,hard',
- require => File ['/mnt/nfspagecountsdata'];
- }
-
- file {
'/usr/local/bin/wmfdumpsmirror.py':
ensure => present,
mode => '0755',
@@ -201,8 +184,8 @@
hour => '3',
command => '/usr/local/sbin/gluster-rsync-cron.sh',
environment => '[email protected]',
- require => [ File[
['/usr/local/bin/wmfdumpsmirror.py', '/usr/local/sbin/gluster-rsync-cron.sh'] ],
- Mount[
['/mnt/nfspagecountsdata', '/mnt/glusterpublicdata'] ] ]
+ require => [ File[
['/usr/local/bin/wmfdumpsmirror.py', '/usr/local/sbin/gluster-rsync-cron.sh'],
+ ['/mnt/glusterpublicdata'] ] ];
}
}
--
To view, visit https://gerrit.wikimedia.org/r/91616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ae226e14f776faa76f76d0d6aff3933f03ce775
Gerrit-PatchSet: 2
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
