From: Sage Weil <sage@inktank.com>
Date: Wed, 24 Jul 2013 20:56:10 +0000 (-0700)
Subject: global/signal_handler: poll on the control pipe, too
X-Git-Tag: v0.67-rc2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7df620b5723d6d7d41338be330ca293f62aa23c;p=ceph.git

global/signal_handler: poll on the control pipe, too

We also need to poll the control fd/pipe so that we restart the poll loop
when new signal handlers are added.  This was broken by commit 8e4a78f1.

Fixes: #5742
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/global/signal_handler.cc b/src/global/signal_handler.cc
index d403637002b1..ce604fe1e5d4 100644
--- a/src/global/signal_handler.cc
+++ b/src/global/signal_handler.cc
@@ -195,6 +195,10 @@ struct SignalHandler : public Thread {
 
       lock.Lock();
       int num_fds = 0;
+      fds[num_fds].fd = pipefd[0];
+      fds[num_fds].events = POLLIN | POLLOUT | POLLERR;
+      fds[num_fds].revents = 0;
+      ++num_fds;
       for (unsigned i=0; i<32; i++) {
 	if (handlers[i]) {
 	  fds[num_fds].fd = handlers[i]->pipefd[0];