Ori.livneh has submitted this change and it was merged.
Change subject: Removed scap-1skins for performance
......................................................................
Removed scap-1skins for performance
* This is far less useful with stuff going through RL now.
It also increases the time that new skins/ code and old
other code is mixed and slows down scap when a few servers
hang.
Change-Id: I7f8779b43e32399b3c42e320eff09101eb7cf613
---
M files/scap/scap
D files/scap/scap-1skins
M modules/mediawiki/manifests/sync.pp
3 files changed, 0 insertions(+), 27 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/files/scap/scap b/files/scap/scap
index 47fef39..6a89b3c 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -55,10 +55,6 @@
# Disable logging
export DOLOGMSGNOLOG=1
-echo 'Copying style sheets to apaches...'
-# Ignore errors from dsh since it gives an exit status of 1 on a connection
timeout
-dsh -F30 -cM -g mediawiki-installation -o -oSetupTimeout=10
'/usr/local/bin/scap-1skins'
-
echo 'Updating rsync proxies...'
dsh -cM -g scap-proxies -o -oSetupTimeout=10 -- /usr/local/bin/scap-1
diff --git a/files/scap/scap-1skins b/files/scap/scap-1skins
deleted file mode 100755
index a72bfb6..0000000
--- a/files/scap/scap-1skins
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-. /usr/local/lib/mw-deployment-vars.sh
-
-mwVersionNums=$(mwversionsinuse)
-if [ -z "$mwVersionNums" ]; then
- echo "Unable to read wikiversions.dat or it is empty"
- exit 1
-fi
-
-for mwVerNum in ${mwVersionNums[@]}; do
- sudo -u mwdeploy sh -c "
- rsync -a --no-perms ${MW_RSYNC_HOST}::common/php-${mwVerNum}/skins/ \
- ${MW_COMMON}/php-${mwVerNum}/skins && \
- echo ok || \
- echo failed
- "
-done
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 3791181..ff02d98 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -24,11 +24,6 @@
group => root,
mode => '0555',
source => 'puppet:///files/scap/scap-1';
- "${scriptpath}/scap-1skins":
- owner => root,
- group => root,
- mode => '0555',
- source => 'puppet:///files/scap/scap-1skins';
"${scriptpath}/scap-2":
owner => root,
group => root,
--
To view, visit https://gerrit.wikimedia.org/r/103880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f8779b43e32399b3c42e320eff09101eb7cf613
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
