Akosiaris has submitted this change and it was merged.
Change subject: fix mpt-statusd mess
......................................................................
fix mpt-statusd mess
It turns out that the mpt-statusd init script is especially bad.
1) It does not support status so we need to instruct puppet to fallback
to running ps to find out if the service runs
2) It does not die nicely leaving defunct processes behind
3) Because of 2 it can also be run multiple times
So, ensuring puppet will find and kill the processes). The -9 might seem
like an overkill, however I found multiple occurences where the 2
processes (e.g. the /usr/bin/daemon /etc/init.d/mpt-statusd check_mpt)
would not respond to SIGTERM so SIGKILL is required instead
Also ensuring they will never start again if the init script is run manually
Change-Id: I31e4f3ddf51dcb19678e0cf34e6d241c2ac36f07
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/monitoring/host.pp
b/modules/base/manifests/monitoring/host.pp
index 0abfaaa..31a2069 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -25,9 +25,19 @@
ensure => 'latest',
}
+ file { '/etc/default/mpt-statusd':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ content => 'RUN_DAEMON=no',
+ }
+
service { 'mpt-statusd':
- ensure => stopped,
- enable => false,
+ ensure => stopped,
+ enable => false,
+ hasstatus => false,
+ stop => '/usr/bin/pkill -9 -f mpt-statusd',
}
file { '/usr/local/bin/check-raid.py':
--
To view, visit https://gerrit.wikimedia.org/r/94356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31e4f3ddf51dcb19678e0cf34e6d241c2ac36f07
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
