From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10697 invoked by alias); 10 Mar 2009 20:54:50 -0000 Received: (qmail 10686 invoked by alias); 10 Mar 2009 20:54:50 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - gfs_controld: dlm_controld failure is cluster_dead 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: c532b00466cb076b803623245d2825dcbb3ea58c X-Git-Newrev: 017303d85ab16c30464c43e4ca9041445cc40be4 From: David Teigland Message-Id: <20090310205427.D53CD1202D2@lists.fedorahosted.org> Date: Tue, 10 Mar 2009 20:54: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/msg00732.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=017303d85ab16c30464c43e4ca9041445cc40be4 Commit: 017303d85ab16c30464c43e4ca9041445cc40be4 Parent: c532b00466cb076b803623245d2825dcbb3ea58c Author: David Teigland AuthorDate: Tue Mar 10 13:49:03 2009 -0500 Committer: David Teigland CommitterDate: Tue Mar 10 13:49:03 2009 -0500 gfs_controld: dlm_controld failure is cluster_dead Losing the dlm_controld connection is equivalent to a cluster failure. Signed-off-by: David Teigland --- group/gfs_controld/main.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c index 399ae41..b15698e 100644 --- a/group/gfs_controld/main.c +++ b/group/gfs_controld/main.c @@ -1115,13 +1115,6 @@ void cluster_dead(int ci) cluster_down = 1; } -static void dlmcontrol_dead(int ci) -{ - if (!list_empty(&mountgroups)) - log_error("dlm_controld is gone"); - client_dead(ci); -} - static void loop(void) { int poll_timeout = -1; @@ -1203,7 +1196,7 @@ static void loop(void) rv = setup_dlmcontrol(); if (rv < 0) goto out; - client_add(rv, process_dlmcontrol, dlmcontrol_dead); + client_add(rv, process_dlmcontrol, cluster_dead); } else if (group_mode == GROUP_LIBGROUP) {