From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20152 invoked by alias); 4 Feb 2009 08:50:43 -0000 Received: (qmail 20143 invoked by alias); 4 Feb 2009 08:50:42 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman: fix notifyd loop To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 300d65909c45dd7425beffe71a249bb91098affb X-Git-Newrev: dc8f60c70f13374a1e1e2dcb242a357ac454f247 From: "Fabio M. Di Nitto" Message-Id: <20090204085017.995311205B1@lists.fedorahosted.org> Date: Wed, 04 Feb 2009 08:50:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00375.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=dc8f60c70f13374a1e1e2dcb242a357ac454f247 Commit: dc8f60c70f13374a1e1e2dcb242a357ac454f247 Parent: 300d65909c45dd7425beffe71a249bb91098affb Author: Fabio M. Di Nitto AuthorDate: Wed Feb 4 09:49:28 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Wed Feb 4 09:49:28 2009 +0100 cman: fix notifyd loop stop polling to check if there are notifications. Use cman_fd+select instead. Signed-off-by: Fabio M. Di Nitto --- cman/notifyd/main.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c index 6aae796..7722032 100644 --- a/cman/notifyd/main.c +++ b/cman/notifyd/main.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -334,25 +335,37 @@ out: static void loop() { - int rv; - - for (;;) { - rv = cman_dispatch(cman_handle, CMAN_DISPATCH_ONE); - if (rv == -1 && errno == EHOSTDOWN) { + int cd_result, se_result; + fd_set read_fds; + int cman_fd; + + do { + FD_ZERO (&read_fds); + cman_fd = cman_get_fd(cman_handle); + FD_SET (cman_fd, &read_fds); + se_result = select((cman_fd + 1), &read_fds, 0, 0, 0); + if (se_result == -1) { + logt_print(LOG_CRIT, "Unable to select on cman_fd: %s\n", strerror(errno)); byebye_cman(); - logt_print(LOG_DEBUG, "waiting for cman to reappear..\n"); - setup_cman(1); - logt_print(LOG_DEBUG, "cman is back..\n"); + exit(EXIT_FAILURE); } - if (daemon_quit) { - logt_print(LOG_DEBUG, "shutting down...\n"); - byebye_cman(); - exit(EXIT_SUCCESS); + if (FD_ISSET(cman_fd, &read_fds)) { + cd_result = 1; + while (cd_result > 0) { + cd_result = cman_dispatch(cman_handle, CMAN_DISPATCH_ONE); + if (cd_result == -1 && errno == EHOSTDOWN) { + byebye_cman(); + logt_print(LOG_DEBUG, "waiting for cman to reappear..\n"); + setup_cman(1); + logt_print(LOG_DEBUG, "cman is back..\n"); + } + } } + } while (se_result && !daemon_quit); - sleep(1); - } + logt_print(LOG_DEBUG, "shutting down...\n"); + byebye_cman(); } int main(int argc, char **argv)