From aa9797fa3c8eddd24c59b1368b1c87e22d470b20 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 21 Jun 2010 10:45:15 +0000 Subject: [PATCH] Let running clvmd process time to reexec. Because execve stops the command loop, we never receive response (only socket close) for clvmd -S, so waiting for response here makes no sense. But if the calling process (clvmd -S) exits too early, connection is closed from client side, clvmd takes this as an error and never run restart code. Ugly hack(TM). --- WHATS_NEW | 1 + daemons/clvmd/refresh_clvmd.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 716e8b82b..0e96f606f 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.68 - =============================== + Add workaround for clvmd -S (socket closed too early and server drops the command). Use early udev synchronisation and update of dev nodes for clustered mirrors. Unneeded kdev_t.h reference causing harm for cmirrord on some archs. Add man pages for lvmconf and unsupported lvmsadc and lvmsar tools. diff --git a/daemons/clvmd/refresh_clvmd.c b/daemons/clvmd/refresh_clvmd.c index 24d29fbe5..c1c3aa6f7 100644 --- a/daemons/clvmd/refresh_clvmd.c +++ b/daemons/clvmd/refresh_clvmd.c @@ -327,8 +327,21 @@ int refresh_clvmd(int all_nodes) int restart_clvmd(int all_nodes) { - int dummy; - return _cluster_request(CLVMD_CMD_RESTART, all_nodes?"*":".", NULL, 0, NULL, &dummy, 1); + int dummy, status; + + status = _cluster_request(CLVMD_CMD_RESTART, all_nodes?"*":".", NULL, 0, NULL, &dummy, 1); + + /* + * FIXME: we cannot receive response, clvmd re-exec before it. + * but also should not close socket too early (the whole rq is dropped then). + * FIXME: This should be handled this way: + * - client waits for RESTART ack (and socket close) + * - server restarts + * - client checks that server is ready again (VERSION command?) + */ + usleep(500000); + + return status; } int debug_clvmd(int level, int clusterwide) -- 2.43.5