From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14531 invoked by alias); 18 Jul 2008 14:53:16 -0000 Received: (qmail 14500 invoked by uid 9453); 18 Jul 2008 14:53:15 -0000 Date: Fri, 18 Jul 2008 14:53:00 -0000 Message-ID: <20080718145315.14484.qmail@sourceware.org> From: teigland@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.06-30-g0946d23 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 89d4526a924e7df5346bbb4d88383c326f90f40f X-Git-Newrev: 0946d230c888c4165dd0d5fcd70509bd0d86fe79 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-q3/txt/msg00098.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=0946d230c888c4165dd0d5fcd70509bd0d86fe79 The branch, master has been updated via 0946d230c888c4165dd0d5fcd70509bd0d86fe79 (commit) from 89d4526a924e7df5346bbb4d88383c326f90f40f (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 0946d230c888c4165dd0d5fcd70509bd0d86fe79 Author: David Teigland Date: Fri Jul 18 09:46:35 2008 -0500 gfs_controld: close dlm_controld connection when we get a poll error from it Signed-off-by: David Teigland ----------------------------------------------------------------------- Summary of changes: group/gfs_controld/main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c index e2214d3..f1a6094 100644 --- a/group/gfs_controld/main.c +++ b/group/gfs_controld/main.c @@ -1003,9 +1003,11 @@ void cluster_dead(int ci) daemon_quit = 1; } -static void dead_dlmcontrol(int ci) +static void dlmcontrol_dead(int ci) { - log_error("dlm_controld poll error %x", pollfd[ci].revents); + if (!list_empty(&mountgroups)) + log_error("dlm_controld is gone"); + client_dead(ci); } static void loop(void) @@ -1072,7 +1074,7 @@ static void loop(void) rv = setup_dlmcontrol(); if (rv < 0) goto out; - client_add(rv, process_dlmcontrol, dead_dlmcontrol); + client_add(rv, process_dlmcontrol, dlmcontrol_dead); } else if (group_mode == GROUP_LIBGROUP) { hooks/post-receive -- Cluster Project