Faidon has submitted this change and it was merged. Change subject: get rid of varnishhtcpd upstart job ......................................................................
get rid of varnishhtcpd upstart job On beta deployment-cache-text1 I end up with two version of the Varnish HTCPD purger: - vhtcpd : from Debian package, started with init script - varnishhtcpd : from puppet, started with upstart The two copy race for UDP port 4827 and cause much havoc on the beta caches. There might be the same issue in production as well. The Perl HTCP purger daemon has been removed in d64e7aa https://gerrit.wikimedia.org/r/#/c/68687/ Change-Id: If86d785362c635cfa97adb07efea222b84eacb1e --- D files/upstart/varnishhtcpd.conf M modules/varnish/manifests/htcppurger.pp 2 files changed, 7 insertions(+), 21 deletions(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/files/upstart/varnishhtcpd.conf b/files/upstart/varnishhtcpd.conf deleted file mode 100644 index c5ea786..0000000 --- a/files/upstart/varnishhtcpd.conf +++ /dev/null @@ -1,21 +0,0 @@ -# varnishhtcpd - varnish HTCP daemon -# -# Receives multicast HTCP UDP packets and sends corresponding HTTP PURGE requests to Varnish - -description "varnish HTCP daemon" - -start on runlevel [2345] -stop on runlevel [!2345] - -respawn - -env DEFAULTFILE=/etc/default/varnishhtcpd - -script - DAEMON_OPTS="" - if [ -f "$DEFAULTFILE" ]; then - . "$DEFAULTFILE" - fi - - exec /usr/local/bin/varnishhtcpd --name=varnishhtcpd --foreground $DAEMON_OPTS -end script \ No newline at end of file diff --git a/modules/varnish/manifests/htcppurger.pp b/modules/varnish/manifests/htcppurger.pp index fb877c4..bbb5a36 100644 --- a/modules/varnish/manifests/htcppurger.pp +++ b/modules/varnish/manifests/htcppurger.pp @@ -15,6 +15,13 @@ content => inline_template('DAEMON_OPTS="-F -m 239.128.0.112<% varnish_instances.each do |inst| -%> -c <%= inst %><% end -%>"'); } + # Wikimedia used to provide vhtcpd under the name varnishhtcpd with an + # upstart job. This is nore more needed since the init script is provided + # by vhtcpd package and the daemon got renamed vhtcpd. + files { '/etc/init/varnishhtcpd.conf': + ensure => absent, + } + service { vhtcpd: require => Package["vhtcpd"], subscribe => File["/etc/default/vhtcpd"], -- To view, visit https://gerrit.wikimedia.org/r/75323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If86d785362c635cfa97adb07efea222b84eacb1e Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: BBlack <[email protected]> Gerrit-Reviewer: Faidon <[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
