From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30873 invoked by alias); 28 Apr 2008 21:11:43 -0000 Received: (qmail 30842 invoked by uid 9476); 28 Apr 2008 21:11:43 -0000 Date: Mon, 28 Apr 2008 21:11:00 -0000 Message-ID: <20080428211143.30826.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.00-1-g5d8906c X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: a32f181b810d22f1f034555958ec2174a8980452 X-Git-Newrev: 5d8906cf847772d3dd3bf3bd49b58fd80e1ab696 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: 2008-q2/txt/msg00215.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=5d8906cf847772d3dd3bf3bd49b58fd80e1ab696 The branch, master has been updated via 5d8906cf847772d3dd3bf3bd49b58fd80e1ab696 (commit) from a32f181b810d22f1f034555958ec2174a8980452 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5d8906cf847772d3dd3bf3bd49b58fd80e1ab696 Author: Lon Hohberger Date: Mon Apr 28 17:11:17 2008 -0400 [cman] Close sockets in error state in gfs_controld / dlmtest2 / groupd test ----------------------------------------------------------------------- Summary of changes: dlm/tests/usertest/dlmtest2.c | 2 +- group/gfs_controld/main.c | 2 +- group/test/clientd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlm/tests/usertest/dlmtest2.c b/dlm/tests/usertest/dlmtest2.c index 8bef439..a8aee3a 100644 --- a/dlm/tests/usertest/dlmtest2.c +++ b/dlm/tests/usertest/dlmtest2.c @@ -1452,7 +1452,7 @@ int main(int argc, char *argv[]) process_command(&quit); } - if (pollfd[i].revents & POLLHUP) + if (pollfd[i].revents & (POLLHUP | POLLERR | POLLNVAL)) client_dead(i); } diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c index 59ac66d..b2edc32 100644 --- a/group/gfs_controld/main.c +++ b/group/gfs_controld/main.c @@ -617,7 +617,7 @@ int loop(void) process_client(i); } - if (pollfd[i].revents & POLLHUP) { + if (pollfd[i].revents & (POLLHUP | POLLERR | POLLNVAL)) { if (pollfd[i].fd == cman_fd) { log_error("cman connection died"); exit_cman(); diff --git a/group/test/clientd.c b/group/test/clientd.c index 940448f..4a8411e 100644 --- a/group/test/clientd.c +++ b/group/test/clientd.c @@ -172,7 +172,7 @@ int loop(void) log_error("poll"); for (i = 0; i <= maxi; i++) { - if (pollfd[i].revents & POLLHUP) { + if (pollfd[i].revents & (POLLHUP | POLLERR | POLLNVAL)) { process_hup(pollfd[i].fd); } else if (pollfd[i].revents & POLLIN) { process_input(pollfd[i].fd); hooks/post-receive -- Cluster Project