From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30652 invoked by alias); 5 Mar 2009 17:27:47 -0000 Received: (qmail 30646 invoked by alias); 5 Mar 2009 17:27:47 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_61,SPF_HELO_PASS X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_61,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: don't exit from query thread 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: 86c9bedb4e31d417b3c92803a82dcc02d36a1ddc X-Git-Newrev: 06f80dea1b729acea6cf1e061a5f7e8edd479de2 From: David Teigland Message-Id: <20090305172716.90D441201F1@lists.fedorahosted.org> Date: Thu, 05 Mar 2009 17:27: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/msg00692.txt.bz2 Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=06f80dea1b729acea6cf1e061a5f7e8edd479de2 Commit: 06f80dea1b729acea6cf1e061a5f7e8edd479de2 Parent: 86c9bedb4e31d417b3c92803a82dcc02d36a1ddc Author: David Teigland AuthorDate: Thu Mar 5 11:23:50 2009 -0600 Committer: David Teigland CommitterDate: Thu Mar 5 11:23:50 2009 -0600 dlm_controld: don't exit from query thread If the query thread gets an error it should just return instead of calling exit() and terminating the daemon uncleanly. Signed-off-by: David Teigland --- group/dlm_controld/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c index eaffd47..71045fe 100644 --- a/group/dlm_controld/main.c +++ b/group/dlm_controld/main.c @@ -748,14 +748,14 @@ static void *process_queries(void *arg) rv = setup_listener(DLMC_QUERY_SOCK_PATH); if (rv < 0) - exit (-1); + return NULL; s = rv; for (;;) { f = accept(s, NULL, NULL); if (f < 0) - exit (-1); + return NULL; rv = do_read(f, &h, sizeof(h)); if (rv < 0) {