Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357362 )
Change subject: jobrunner: add exit codes to services units
......................................................................
jobrunner: add exit codes to services units
To stop the jobrunner services, upstart/systemd send SIGTERM then
SIGKILL. Both signals are caught by the jobrunner/jobchron and their
exit code is 128 + signal. SIGHUP has the same behavior as well.
Instruct systemd and upstart to consider some additional exit codes as
successful exits:
SIGHUP(1) + 128 = 129
SIGKILL(9) + 128 = 137
SIGTERM(15) + 128 = 143
Change-Id: Ib1cc01eec0825af0341039611d4a3c97dff9b7c0
---
M modules/mediawiki/templates/initscripts/jobchron.systemd.erb
M modules/mediawiki/templates/initscripts/jobchron.upstart.erb
M modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
M modules/mediawiki/templates/initscripts/jobrunner.upstart.erb
4 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/357362/1
diff --git a/modules/mediawiki/templates/initscripts/jobchron.systemd.erb
b/modules/mediawiki/templates/initscripts/jobchron.systemd.erb
index 8106c1a..f6aed70 100644
--- a/modules/mediawiki/templates/initscripts/jobchron.systemd.erb
+++ b/modules/mediawiki/templates/initscripts/jobchron.systemd.erb
@@ -9,6 +9,7 @@
SyslogIdentifier=jobchron
ExecStart=/usr/bin/php
/srv/deployment/jobrunner/jobrunner/redisJobChronService
--config-file=${JOBRUNNER_CONFIG} ${DAEMON_OPTS}
Restart=always
+SuccessExitStatus=0 129 137 143
[Install]
WantedBy=multi-user.target
diff --git a/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
b/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
index ccd2d2f..59d5d85 100644
--- a/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
+++ b/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
@@ -4,6 +4,8 @@
start on (runlevel [2345] and net-device-up IFACE!=lo)
stop on runlevel [!2345]
+normal exit 0 129 137 143
+
pre-start script
mkdir -p -m0755 /var/run/jobchron
[ ! -r /etc/default/jobrunner ] && { stop; exit 0; }
diff --git a/modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
b/modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
index 4de1865..43d76a9 100644
--- a/modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
+++ b/modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
@@ -9,6 +9,7 @@
SyslogIdentifier=jobrunner
ExecStart=/usr/bin/php
/srv/deployment/jobrunner/jobrunner/redisJobRunnerService
--config-file=${JOBRUNNER_CONFIG} ${DAEMON_OPTS}
Restart=always
+SuccessExitStatus=0 129 137 143
[Install]
WantedBy=multi-user.target
diff --git a/modules/mediawiki/templates/initscripts/jobrunner.upstart.erb
b/modules/mediawiki/templates/initscripts/jobrunner.upstart.erb
index 60b3f3b..a376f0e 100644
--- a/modules/mediawiki/templates/initscripts/jobrunner.upstart.erb
+++ b/modules/mediawiki/templates/initscripts/jobrunner.upstart.erb
@@ -4,6 +4,8 @@
start on (runlevel [2345] and net-device-up IFACE!=lo)
stop on runlevel [!2345]
+normal exit 0 129 137 143
+
pre-start script
mkdir -p -m0755 /var/run/jobrunner
[ ! -r /etc/default/jobrunner ] && { stop; exit 0; }
--
To view, visit https://gerrit.wikimedia.org/r/357362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1cc01eec0825af0341039611d4a3c97dff9b7c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
