infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

setup mirrorlist containers to report stats and add a mirrorlist-proxy group for easier handling

Browse source
This commit is contained in:
Kevin Fenzi 2017-02-13 17:36:42 +00:00
parent 14d68a4b22
commit 7fe9ad348e
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/inventory
View file

@ -495,6 +495,10 @@ mirrorlist-phx2.phx2.fedoraproject.org
[mirrorlist2-stg] [mirrorlist2-stg]
mirrorlist-phx2.stg.phx2.fedoraproject.org mirrorlist-phx2.stg.phx2.fedoraproject.org
[mirrorlist-proxies]
proxy02.fedoraproject.org
proxy05.fedoraproject.org
[mm-frontend] [mm-frontend]
mm-frontend01.phx2.fedoraproject.org mm-frontend01.phx2.fedoraproject.org
mm-frontend02.phx2.fedoraproject.org mm-frontend02.phx2.fedoraproject.org

17
roles/mirrormanager/backend/templates/create_statistics.sh
View file

@ -1,21 +1,26 @@
#!/bin/sh #!/bin/sh
MIRRORLIST_SERVERS="{% for host in groups['mirrorlist2'] %} {{ host }} {% endfor %}" MIRRORLIST_SERVERS="{% for host in groups['mirrorlist2'] %} {{ host }} {% endfor %}"
MIRRORLIST_PROXIES="{% for host in groups['mirrorlist-proxies'] %} {{ host }} {% endfor %}"
FRONTENDS="{% for host in groups['mm-frontend'] %} {{ host }} {% endfor %}" FRONTENDS="{% for host in groups['mm-frontend'] %} {{ host }} {% endfor %}"
INPUT="/var/log/mirrormanager/mirrorlist.log" INPUT="/var/log/mirrormanager/mirrorlist.log"
CONTAINER1="/var/log/mirrormanager/mirrorlist1.service.log"
CONTAINER2="/var/log/mirrormanager/mirrorlist2.service.log"
if [ "$1" == "yesterday" ]; then if [ "$1" == "yesterday" ]; then
DATE=`date +%Y-%m-%d --date='yesterday'` DATE=`date +%Y%m%d --date='yesterday'`
STATISTICS="/usr/bin/mirrorlist_statistics -o 1" STATISTICS="/usr/bin/mirrorlist_statistics -o 1"
DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m --date='yesterday'`" DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m --date='yesterday'`"
else else
DATE=`date +%Y-%m-%d` DATE=`date +%Y%m%d`
STATISTICS="/usr/bin/mirrorlist_statistics" STATISTICS="/usr/bin/mirrorlist_statistics"
DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m`" DEST="/var/www/mirrormanager-statistics/data/`date +%Y/%m`"
fi fi
INFILE=${INPUT}.${DATE} INFILE=${INPUT}-${DATE}.xz
INFILE_CONTAINER1=${CONTAINER1}-${DATE}.xz
INFILE_CONTAINER2=${CONTAINER2}-${DATE}.xz
OUTPUT=`mktemp -d` OUTPUT=`mktemp -d`
@ -23,7 +28,11 @@ OUTPUT=`mktemp -d`
# Fetch compressed log files # Fetch compressed log files
for s in ${MIRRORLIST_SERVERS}; do for s in ${MIRRORLIST_SERVERS}; do
ssh $s "( cat $INFILE | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz ssh $s "( xzcat $INFILE | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
done
for s in ${MIRRORLIST_PROXIES}; do
ssh $s "( xzcat $INFILE_CONTAINER1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
ssh $s "( xzcat $INFILE_CONTAINER2 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
done done
${STATISTICS} -l ${OUTPUT}/mirrorlist.log.gz -d ${OUTPUT}/ ${STATISTICS} -l ${OUTPUT}/mirrorlist.log.gz -d ${OUTPUT}/

2
roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh
View file

@ -9,7 +9,7 @@ done
# sync also to new mirrorlist containers on proxies # sync also to new mirrorlist containers on proxies
MIRRORLIST_PROXY="proxy02.fedoraproject.org proxy05.fedoraproject.org" MIRRORLIST_PROXY="{% for host in groups['mirrorlist-proxies'] %} {{ host }} {% endfor %}"
for s in ${MIRRORLIST_PROXY}; do for s in ${MIRRORLIST_PROXY}; do
rsync -az --delete-delay --delay-updates --delete /var/lib/mirrormanager/{*pkl,*txt} ${s}:/srv/mirrorlist/data/mirrorlist1/ rsync -az --delete-delay --delay-updates --delete /var/lib/mirrormanager/{*pkl,*txt} ${s}:/srv/mirrorlist/data/mirrorlist1/