Mark Bergsma has submitted this change and it was merged.
Change subject: Retry starting Varnish 3 times on temp error 75
......................................................................
Retry starting Varnish 3 times on temp error 75
Change-Id: Ifd8a9fae6aafe58dcff15ddb4a2e5bc226808a24
---
M modules/varnish/templates/varnish.init.erb
1 file changed, 17 insertions(+), 10 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/templates/varnish.init.erb
b/modules/varnish/templates/varnish.init.erb
index 4f19afe..b382939 100755
--- a/modules/varnish/templates/varnish.init.erb
+++ b/modules/varnish/templates/varnish.init.erb
@@ -50,16 +50,23 @@
output=$(/bin/tempfile -s.varnish)
log_daemon_msg "Starting $DESC"
log_progress_msg $NAME
- if start-stop-daemon \
- --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} -- \
- -P ${PIDFILE} ${DAEMON_OPTS} <% if
cluster_options.fetch("enable_geoiplookup", false) -%>-p
cc_command="${CC_COMMAND}"<% end -%> > ${output} 2>&1; then
- log_end_msg 0
- else
- log_end_msg 1
- cat $output
- exit 1
- fi
- rm $output
+ for i in `seq 1 3`
+ do
+ if start-stop-daemon \
+ --start --quiet --pidfile ${PIDFILE} --exec
${DAEMON} -- \
+ -P ${PIDFILE} ${DAEMON_OPTS} <% if
cluster_options.fetch("enable_geoiplookup", false) -%>-p
cc_command="${CC_COMMAND}"<% end -%> > ${output} 2>&1; then
+ log_end_msg 0
+ break
+ else
+ if [ $? != 75 -o $i == 3 ]
+ then
+ log_end_msg 1
+ cat $output
+ exit 1
+ fi
+ fi
+ rm $output
+ done
;;
stop)
log_daemon_msg "Stopping $DESC"
--
To view, visit https://gerrit.wikimedia.org/r/73151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd8a9fae6aafe58dcff15ddb4a2e5bc226808a24
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
