From 470b46cee13fe77a6c8ff8658e93847985599874 Mon Sep 17 00:00:00 2001 From: Patrick Caulfield Date: Tue, 14 Jun 2005 10:35:02 +0000 Subject: [PATCH] Log an error if clvmd can't resolve a host name got from CCS Fix potential spin loop in clvmd --- WHATS_NEW | 2 ++ daemons/clvmd/clvmd-gulm.c | 8 +++++++- daemons/clvmd/clvmd.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW b/WHATS_NEW index a9714f9f3..0bbbaa11e 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,7 @@ Version 2.01.12 - ================================ + Log an error if clvmd can't resolve a host name got from CCS + Fix potential spin loop in clvmd Version 2.01.11 - 13th June 2005 ================================ diff --git a/daemons/clvmd/clvmd-gulm.c b/daemons/clvmd/clvmd-gulm.c index c3d4896f0..4ac06af33 100644 --- a/daemons/clvmd/clvmd-gulm.c +++ b/daemons/clvmd/clvmd-gulm.c @@ -944,7 +944,13 @@ static int get_all_cluster_nodes() } else { - DEBUGLOG("node %s has clvm disabled\n", nodename); + if (!clvmflag) { + DEBUGLOG("node %s has clvm disabled\n", nodename); + } + else { + DEBUGLOG("Cannot resolve host name %s\n", nodename); + log_err("Cannot resolve host name %s\n", nodename); + } } free(nodename); } diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index 6a0c18697..0e2b5a409 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -512,6 +512,10 @@ static void main_loop(int local_sock, int cmd_timeout) FD_ZERO(&in); for (thisfd = &local_client_head; thisfd != NULL; thisfd = thisfd->next) { + + if (thisfd->removeme) + continue; + /* if the cluster is not quorate then don't listen for new requests */ if ((thisfd->type != LOCAL_RENDEZVOUS && thisfd->type != LOCAL_SOCK) || quorate) -- 2.43.5