Merge lp:~nutznboltz-deactivatedaccount/ubuntu/precise/nagios-nrpe/fix-lp896388 into lp:ubuntu/precise/nagios-nrpe

Proposed by nutznboltz
Status: Work in progress
Proposed branch: lp:~nutznboltz-deactivatedaccount/ubuntu/precise/nagios-nrpe/fix-lp896388
Merge into: lp:ubuntu/precise/nagios-nrpe
Diff against target: 34 lines (+8/-4)
2 files modified
debian/changelog (+6/-0)
debian/nagios-nrpe-server.init (+2/-4)
To merge this branch: bzr merge lp:~nutznboltz-deactivatedaccount/ubuntu/precise/nagios-nrpe/fix-lp896388
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+83441@code.launchpad.net

Description of the change

LP: #600941 introduced a regression that causes the nrpe daemon to
not restart when "/etc/init.d/nagios-nrpe-server restart" is used
and the system is so busy that nrpe doesn't stop in a couple seconds.

start-stop-daemon ... --stop

only waits one second after having sent the SIGTERM signal to the nrpe
process and if nrpe still is bound to the socket the
"/etc/init.d/nagios-nrpe-server restart" will launch nrpe as a second
instance which aborts when bind(2) on the still-active socket is
attempted. This causes "/etc/init.d/nagios-nrpe-server restart" to have
the same net effect as "stop".

To post a comment you must log in.
Revision history for this message
nutznboltz (nutznboltz-deactivatedaccount) wrote :

See also LP: #896388

Revision history for this message
Stéphane Graber (stgraber) wrote :

As mentioned in the bug and on the forum thread, I'd like to see this discussed and fix in Debian first so we end up having the same fix for the issue (as we currently share the init script).

Marking the branch as work in progress for now.

Revision history for this message
Clint Byrum (clint-fewbar) wrote :

nutznboltz, please do understand that packages in universe are largely maintained in Debian, so we need to make sure that we push fixes back to Debian. Your fix will land in ubuntu too! This is just a normal part of the merge proposal process.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

This has now been fixed in Debian.
New merge is submitted targeting Quantal.
https://code.launchpad.net/~dmitrij.ledkov/ubuntu/quantal/nagios-nrpe/merge/+merge/104515
The bug is serious.
Needs SRUs to precise and earlier. So this merge is superseeded.

Unmerged revisions

14. By nutznboltz

Fixing regression caused by bug 600941. (LP: #896388)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-10-18 15:09:21 +0000
3+++ debian/changelog 2011-11-25 20:05:28 +0000
4@@ -1,3 +1,9 @@
5+nagios-nrpe (2.12-5ubuntu2) precise; urgency=low
6+
7+ * Fixing regression caused by bug 600941. (LP: #896388)
8+
9+ -- nutznboltz <kstailey@yahoo.com> Fri, 25 Nov 2011 14:51:26 -0500
10+
11 nagios-nrpe (2.12-5ubuntu1) precise; urgency=low
12
13 * Merge with Debian; remaining changes:
14
15=== modified file 'debian/nagios-nrpe-server.init'
16--- debian/nagios-nrpe-server.init 2011-10-18 15:09:21 +0000
17+++ debian/nagios-nrpe-server.init 2011-11-25 20:05:28 +0000
18@@ -59,14 +59,12 @@
19 ;;
20 stop)
21 log_daemon_msg "Stopping $DESC" "$NAME"
22- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
23+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid --retry 15
24 log_end_msg $?
25- #sometimes deleting the pidfile fails. cleanup afterwards.
26- test -e $PIDDIR/nrpe.pid && rm $PIDDIR/nrpe.pid
27 ;;
28 reload|force-reload)
29 log_daemon_msg "Reloading $DESC configuration files" "$NAME"
30- start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
31+ start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
32 log_end_msg $?
33 ;;
34 status)

Subscribers

People subscribed via source and target branches

to all changes: