This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - fenced/dlm_controld/gfs_controld: don't exit fromquery thread
- From: David Teigland <teigland at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 5 Mar 2009 17:25:18 +0000 (UTC)
- Subject: cluster: STABLE3 - fenced/dlm_controld/gfs_controld: don't exit fromquery thread
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1ca6ef5487296f9386ab601e7b062cfaa4829920
Commit: 1ca6ef5487296f9386ab601e7b062cfaa4829920
Parent: 2c724185bb57b9998c555edafc326badf5facd60
Author: David Teigland <teigland@redhat.com>
AuthorDate: Thu Mar 5 11:21:07 2009 -0600
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Thu Mar 5 11:21:07 2009 -0600
fenced/dlm_controld/gfs_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 <teigland@redhat.com>
---
fence/fenced/main.c | 4 ++--
group/dlm_controld/main.c | 4 ++--
group/gfs_controld/main.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fence/fenced/main.c b/fence/fenced/main.c
index ceacdd8..27db383 100644
--- a/fence/fenced/main.c
+++ b/fence/fenced/main.c
@@ -555,14 +555,14 @@ static void *process_queries(void *arg)
rv = setup_listener(FENCED_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) {
diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index cace8d1..3c5c21b 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -776,14 +776,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) {
diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c
index cb59184..399ae41 100644
--- a/group/gfs_controld/main.c
+++ b/group/gfs_controld/main.c
@@ -1040,14 +1040,14 @@ static void *process_queries(void *arg)
rv = setup_listener(GFSC_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) {