You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
1.6 KiB
51 lines
1.6 KiB
WHATS_NEW | 1 + |
|
libdaemon/server/daemon-server.c | 11 +++++++++-- |
|
2 files changed, 10 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/WHATS_NEW b/WHATS_NEW |
|
index 00b84f9..ac70074 100644 |
|
--- a/WHATS_NEW |
|
+++ b/WHATS_NEW |
|
@@ -1,5 +1,6 @@ |
|
Version 2.02.187 - |
|
=================================== |
|
+ Fix lvmetad shutdown and avoid lenghty timeouts when rebooting system. |
|
Prevent creating VGs with PVs with different logical block sizes. |
|
Pvmove runs in exlusively activating mode for exclusively active LVs. |
|
Activate thin-pool layered volume as 'read-only' device. |
|
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c |
|
index bc58f7b..62f403a 100644 |
|
--- a/libdaemon/server/daemon-server.c |
|
+++ b/libdaemon/server/daemon-server.c |
|
@@ -89,6 +89,13 @@ static int _is_idle(daemon_state s) |
|
|
|
static struct timespec *_get_timeout(daemon_state s) |
|
{ |
|
+ static struct timespec _tm = { 0 }; |
|
+ |
|
+ if (_shutdown_requested) { |
|
+ _tm.tv_sec = 1; |
|
+ return &_tm; |
|
+ } |
|
+ |
|
return s.idle ? s.idle->ptimeout : NULL; |
|
} |
|
|
|
@@ -506,7 +513,7 @@ static int _handle_connect(daemon_state s) |
|
socklen_t sl = sizeof(sockaddr); |
|
|
|
client.socket_fd = accept(s.socket_fd, (struct sockaddr *) &sockaddr, &sl); |
|
- if (client.socket_fd < 0) { |
|
+ if (client.socket_fd < 0 || _shutdown_requested) { |
|
if (errno != EAGAIN || !_shutdown_requested) |
|
ERROR(&s, "Failed to accept connection: %s.", strerror(errno)); |
|
return 0; |
|
@@ -672,7 +679,7 @@ void daemon_start(daemon_state s) |
|
continue; |
|
} |
|
|
|
- if (FD_ISSET(s.socket_fd, &in)) { |
|
+ if (!_shutdown_requested && FD_ISSET(s.socket_fd, &in)) { |
|
timeout_count = 0; |
|
_handle_connect(s); |
|
}
|
|
|