Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hhvm: remove unnecessary upstart stanza, config option
......................................................................
hhvm: remove unnecessary upstart stanza, config option
The hhvm.server.graceful_shutdown_wait option will work only if the HHVM
server gets shut down by calling the /stop url on the admin server.The
only practical effect of hhvm.server.graceful_shutdown_wait in our setup
would be that:
- The socket communicating with apache will be reset immediately
- Requests will be processed internally until they either end or the
wait is reached; apache will still, ironically, get a 503.
- Any new connection will be refused, resulting in more 503s
So I think this option is basically useless with the FastCGI server,
unless the server is processing some operations that can be
unacknowledged.
Finally, if any kill signal is sent to HHVM, it will happily forget
about that setting and die instantly. Since upstart kills and
restarts/reloads its services by sending signals, this configuration has
zero effects on it.
Change-Id: If27c02833a54343ba3ea423f5a4185ff3608a4ef
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
2 files changed, 0 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index 523fd6f..0e7378c 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -70,10 +70,6 @@
# Increase the maximum size of the stack to 64MiB. See bug 71486.
limit stack 67108864 unlimited
-# When `hhvm.server.graceful_shutdown_wait` is set to a positive
-# integer, HHVM will perform a graceful shutdown on SIGHUP.
-kill signal HUP
-
respawn
respawn limit unlimited
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index d702e17..8a312a4 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -136,7 +136,6 @@
port => 9000,
type => 'fastcgi',
gzip_compression_level => 0,
- graceful_shutdown_wait => 5,
},
},
}
--
To view, visit https://gerrit.wikimedia.org/r/171244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If27c02833a54343ba3ea423f5a4185ff3608a4ef
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
