coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/89014
Change subject: Tool Labs: fix race condition (for real) ...................................................................... Tool Labs: fix race condition (for real) Turns out NFS rename semantics are not as useful as one would hope; move lockfiles to /tmp for great justice! Change-Id: I810ce2b940606b736cbcf95be01bd22a6f2d9690 --- M modules/toollabs/files/tool-lighttpd 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/89014/1 diff --git a/modules/toollabs/files/tool-lighttpd b/modules/toollabs/files/tool-lighttpd index f66df5c..2239aab 100755 --- a/modules/toollabs/files/tool-lighttpd +++ b/modules/toollabs/files/tool-lighttpd @@ -31,8 +31,8 @@ exit 1 fi -export llock="$scoreboard.lock.$tool" -export lock="$scoreboard.lock" +export llock="/tmp/toollock.$tool" +export lock="/tmp/toollock.lock" trap "rm -f $llock" 0 touch $llock @@ -144,7 +144,7 @@ trap "cleanup;exit 0" 15 -/bin/su -c "echo $user; id; set; /usr/sbin/lighttpd -f $runbase.conf -D 2>&1 >>$home/error.log" - "$user" +/bin/su -c "/usr/sbin/lighttpd -f $runbase.conf -D 2>&1 >>$home/error.log" - "$user" /bin/date >"$home/lighttpd.STOPPED" cleanup -- To view, visit https://gerrit.wikimedia.org/r/89014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I810ce2b940606b736cbcf95be01bd22a6f2d9690 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
