coren has submitted this change and it was merged.
Change subject: Tool Labs: fix race condition on webnodes
......................................................................
Tool Labs: fix race condition on webnodes
When several servers start at once, sometimes the dynamic
list gets clobbered.
Change-Id: I2291660e37e303c717a68c72e5341398670759f4
---
M modules/toollabs/files/tool-lighttpd
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/files/tool-lighttpd
b/modules/toollabs/files/tool-lighttpd
index 750922a..4075922 100755
--- a/modules/toollabs/files/tool-lighttpd
+++ b/modules/toollabs/files/tool-lighttpd
@@ -35,7 +35,8 @@
lock="$scoreboard.lock"
trap "rm -f $llock" 0
touch $llock
-while ! mv -n $llock $lock >/dev/null 2>&1; do
+while [ -f $llock ]; do
+ mv -n $llock $lock
sleep 1
done
trap "rm -f $lock $scoreboard.tmp" 0
@@ -129,7 +130,8 @@
cleanup() {
trap "rm -f $llock" 0
touch $llock
- while ! mv -n $llock $lock >/dev/null 2>&1; do
+ while [ -f $llock ]; do
+ mv -n $llock $lock
sleep 1
done
trap "rm -f $lock $scoreboard.tmp" 0
--
To view, visit https://gerrit.wikimedia.org/r/89005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2291660e37e303c717a68c72e5341398670759f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
