Nuria has uploaded a new change for review. https://gerrit.wikimedia.org/r/130588
Change subject: [WIP] Upstart follows fork when starting celery. ...................................................................... [WIP] Upstart follows fork when starting celery. I think the PID stored by upstart when identifying the parent queue processes was not correct. Upstart should 'follow' the fork to identify the right process. PID stored by upstart is returned running $ initctl status wikimetrics-queue Side note: celery had several issues regarding termination of child processes. It looks like those were resolved in version 3.1 which is the one we are running. See: https://github.com/celery/django-celery/issues/142 Bug: 63819 Change-Id: I6bf30b9562eeec2b513edc8b70938c63b1564c76 --- M templates/upstart.wikimetrics.conf.erb 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/wikimetrics refs/changes/88/130588/1 diff --git a/templates/upstart.wikimetrics.conf.erb b/templates/upstart.wikimetrics.conf.erb index a156e6b..f2e4642 100644 --- a/templates/upstart.wikimetrics.conf.erb +++ b/templates/upstart.wikimetrics.conf.erb @@ -1,8 +1,15 @@ + start on <%= @service_start_on %> setuid <%= scope.lookupvar('wikimetrics::user') %> setgid <%= scope.lookupvar('wikimetrics::group') %> +<% if @mode == 'queue' -%> +expect fork +<% end %> + script + wikimetrics --mode <%= @mode %> --db-config <%= @config_directory %>/db_config.yaml --queue-config <%= @config_directory %>/queue_config.yaml --web-config <%= @config_directory %>/web_config.yaml + end script -- To view, visit https://gerrit.wikimedia.org/r/130588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6bf30b9562eeec2b513edc8b70938c63b1564c76 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/wikimetrics Gerrit-Branch: master Gerrit-Owner: Nuria <nu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
