From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5379 invoked by alias); 31 Mar 2009 15:06:39 -0000 Received: (qmail 5067 invoked by alias); 31 Mar 2009 15:06:37 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_22,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_22,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: dlm: master - dlm_controld: add some log messages To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: dlm.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9ece1eee48182537cf54f20ee54bece54cfd64dc X-Git-Newrev: 625fa3e6ded1623146e7bcd06a3372fb4f616f2b From: David Teigland Message-Id: <20090331150608.00ADC120197@lists.fedorahosted.org> Date: Tue, 31 Mar 2009 15:06: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/msg00987.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=625fa3e6ded1623146e7bcd06a3372fb4f616f2b Commit: 625fa3e6ded1623146e7bcd06a3372fb4f616f2b Parent: 9ece1eee48182537cf54f20ee54bece54cfd64dc Author: David Teigland AuthorDate: Tue Mar 31 10:00:26 2009 -0500 Committer: David Teigland CommitterDate: Tue Mar 31 10:00:26 2009 -0500 dlm_controld: add some log messages providing more info about the shutdown process Signed-off-by: David Teigland --- group/dlm_controld/main.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c index 9fde4f3..32ed522 100644 --- a/group/dlm_controld/main.c +++ b/group/dlm_controld/main.c @@ -839,6 +839,7 @@ void cluster_dead(int ci) static void loop(void) { + struct lockspace *ls; int poll_timeout = -1; int rv, i; void (*workfn) (int ci); @@ -856,9 +857,8 @@ static void loop(void) rv = setup_cluster_cfg(); if (rv < 0) goto out; - /* Not all cluster types use cfg */ - if(rv > 0) - client_add(rv, process_cluster_cfg, cluster_dead); + if (rv > 0) + client_add(rv, process_cluster_cfg, cluster_dead); rv = setup_cluster(); if (rv < 0) @@ -919,6 +919,7 @@ static void loop(void) if (rv == -1 && errno == EINTR) { if (daemon_quit && list_empty(&lockspaces)) goto out; + log_error("shutdown ignored, active lockspaces"); daemon_quit = 0; continue; } @@ -965,6 +966,7 @@ static void loop(void) query_unlock(); } out: + log_debug("shutdown"); close_plocks(); close_cpg(); clear_configfs(); @@ -973,8 +975,8 @@ static void loop(void) close_cluster(); close_cluster_cfg(); - if (!list_empty(&lockspaces)) - log_error("lockspaces abandoned"); + list_for_each_entry(ls, &lockspaces, list) + log_error("abandoned lockspace %s", ls->name); } static void lockfile(void)