Date: Fri, 2 Dec 2016 16:43:16 +0000 (UTC) From: Ulrich Spoerlein <uqs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r309420 - user/uqs/git_conv Message-ID: <201612021643.uB2GhGwg012771@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: uqs Date: Fri Dec 2 16:43:16 2016 New Revision: 309420 URL: https://svnweb.freebsd.org/changeset/base/309420 Log: Add svn sync script copied from the cluster machines. Turns out svnsync is non-atomic and we now have bad metadata in the git conversion as export on Github. Ceterum censeo SVN esse delendam Added: user/uqs/git_conv/dosync.sh (contents, props changed) Added: user/uqs/git_conv/dosync.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/uqs/git_conv/dosync.sh Fri Dec 2 16:43:16 2016 (r309420) @@ -0,0 +1,99 @@ +#! /bin/sh +HOME=/home/svnmir +export HOME +PATH=/usr/local/bin:$PATH +export PATH + +# svnsync is non-atomic. Every commit is done in two distinct steps. +# 1: the commit is replayed as a transaction. +# 2: after the commit, the metadata is copied as a *separate* transaction. +# This makes svnsync -> svnsync chains annoying as there is a brief window +# between #1 and #2 where the repo is unlocked and bogus metadata is +# visible. (!!!) +# As a workaround, recheck the svn:author property of the last few +# revisions and re-copy as needed. This reduces the window to a few +# seconds. Still not good but better than no recovery at all. + +#MAILTO=clusteradm-updates@FreeBSD.org +#@reboot /usr/sbin/daemon -cf lockf -s -t 0 /home/svnmir/dosync.lock /home/svnmir/dosync.sh +#* * * * * /usr/sbin/daemon -cf lockf -s -t 0 /home/svnmir/dosync.lock /home/svnmir/dosync.sh +#7 * * * * /home/svnmir/update.sh + +usage() { + echo "Usage: $0 [-1] [-l logdir ] [-r repodirs] [-s setlist]" 1>&2 + exit 1 +} + +umask 002 +me=$(id -un) + +once=false +logdir=/var/log +repodirs=/home/svn +setlist="" + +while getopts "1l:r:s:" _opt; do + case "$_opt" in + 1) once=true ;; + l) logdir="$OPTARG" ;; + r) repodirs="$OPTARG" ;; + s) setlist="$OPTARG" ;; + *) usage ;; +esac +done +shift $(($OPTIND - 1)) +if [ $# -ne 0 ]; then + usage +fi + +if [ -z "${setlist}" ]; then + for r in base doc ports socsvn; do + if [ -d ${repodirs}/$r ]; then + setlist="${setlist} $r" + fi + done +fi + +# Only ever run this under the dosync.lock +for r in ${setlist}; do + echo "Startup: $(date)" >> ${logdir}/svnsync-$r.log +done + +t0=$(date +%s) + +# Pack repo once at startup +for r in ${setlist}; do + svnadmin pack ${repodirs}/$r >> ${logdir}/svnsync-$r.log 2>&1 +done + +while : +do + for r in ${setlist}; do + locked=$(svn propget --revprop -r 0 svn:sync-lock file://${repodirs}/$r 2>/dev/null) + if [ -n "$locked" ]; then + svn propdel --revprop -r 0 svn:sync-lock file://${repodirs}/$r >>${logdir}/svnsync-$r.log 2>&1 + fi + oldrev=$(svn propget --revprop -r 0 svn:sync-last-merged-rev file://${repodirs}/$r 2>>${logdir}/svnsync-$r.log) + svnsync --non-interactive sync file://${repodirs}/$r >> ${logdir}/svnsync-$r.log 2>&1 + newrev=$(svn propget --revprop -r 0 svn:sync-last-merged-rev file://${repodirs}/$r 2>>${logdir}/svnsync-$r.log) + oldrev=$(($oldrev - 10)) + numrev=$(($newrev - $oldrev + 1)) + for rev in $(jot $numrev $oldrev); do + a=$(svn propget --revprop -r $rev svn:author file://${repodirs}/$r 2>>${logdir}/svnsync-$r.log) + if [ "x$a" == "x$me" ]; then + svnsync copy-revprops -r $rev file://${repodirs}/$r >> ${logdir}/svnsync-$r.log 2>&1 + fi + done + done + if $once; then + exit 0 + fi + # exit and restart once an hour in case of a script update + now=$(date +%s) + elapsed=$(( $now - $t0 )) + # slightly less than 1 hour so we catch the cron restart asap + if [ ${elapsed} -gt 3590 ]; then + exit 0 + fi + sleep 5 +done
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612021643.uB2GhGwg012771>