From 8d5ae472e5226f87175d51722fb5942c531bb8bb Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Thu, 19 Jul 2012 16:45:08 +0200 Subject: [PATCH] daemon-server: fix error message on daemon shutdown If a daemon (like lvmetad that is using common daemon-server code) received a kill signal that was supposed to shut the daemon down, a spurious message was issued: "Failed to handle a client connection". This happened if the kill signal came just in the middle of waiting for a client request in "select" - the request that was supposed to be handled was blank at that moment of course. --- WHATS_NEW | 1 + libdaemon/server/daemon-server.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW b/WHATS_NEW index 925ae235c..4f23c398b 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Do not issue "Failed to handle a client connection" error if lvmetad killed. Support changing of discard and zeroing for thin pool. Report used discard for thin pool and volume. Add support for controlling discard behavior of thin pool. diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index 65b28e462..5ca923160 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -510,7 +510,7 @@ void daemon_start(daemon_state s) if (select(FD_SETSIZE, &in, NULL, NULL, NULL) < 0 && errno != EINTR) perror("select error"); if (FD_ISSET(s.socket_fd, &in)) - if (!handle_connect(s)) + if (!_shutdown_requested && !handle_connect(s)) syslog(LOG_ERR, "Failed to handle a client connection."); }