From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25799 invoked by alias); 11 Aug 2009 19:57:46 -0000 Received: (qmail 25793 invoked by alias); 11 Aug 2009 19:57:46 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 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.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: master - qdisk: Do not do a clean logout when exiting w/ error To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9309c9289a63c0cd583438faa2212401f860a316 X-Git-Newrev: 654431f62a8bfe45cb8c7d2a9dd2f407d978a325 From: Lon Hohberger Message-Id: <20090811195726.600E91201D6@lists.fedorahosted.org> Date: Tue, 11 Aug 2009 19:57: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-q3/txt/msg00189.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=654431f62a8bfe45cb8c7d2a9dd2f407d978a325 Commit: 654431f62a8bfe45cb8c7d2a9dd2f407d978a325 Parent: 9309c9289a63c0cd583438faa2212401f860a316 Author: Lon Hohberger AuthorDate: Mon Jul 13 11:47:38 2009 -0400 Committer: Lon Hohberger CommitterDate: Tue Aug 11 15:57:17 2009 -0400 qdisk: Do not do a clean logout when exiting w/ error Signed-off-by: Lon Hohberger --- cman/qdisk/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 0cc23b7..5fe6c11 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -1801,12 +1801,14 @@ main(int argc, char **argv) io_nanny_start(ctx.qc_tko * ctx.qc_interval); - if (quorum_loop(&ctx, ni, MAX_NODES_DISK) == 0) + if (quorum_loop(&ctx, ni, MAX_NODES_DISK) == 0) { + /* Only clean up if we're exiting w/o error) */ cman_unregister_quorum_device(ctx.qc_cman_admin); + quorum_logout(&ctx); + } io_nanny_stop(); - quorum_logout(&ctx); out: /* free cman handle to avoid leak in cman */ cman_finish(ch_admin);