diff options
author | Milan Broz <mbroz@redhat.com> | 2010-06-21 10:45:15 +0000 |
---|---|---|
committer | Milan Broz <mbroz@redhat.com> | 2010-06-21 10:45:15 +0000 |
commit | aec39dcc34b5d6c7b94d084e17957031f512e594 (patch) | |
tree | c88cb864bb579fd4f7c88359b1e767a05a59b81e /daemons/clvmd/refresh_clvmd.c | |
parent | 566515c095121d8411dd0686d52e70d644f39299 (diff) | |
download | lvm2-aec39dcc34b5d6c7b94d084e17957031f512e594.tar.gz lvm2-aec39dcc34b5d6c7b94d084e17957031f512e594.tar.xz lvm2-aec39dcc34b5d6c7b94d084e17957031f512e594.zip |
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).
Diffstat (limited to 'daemons/clvmd/refresh_clvmd.c')
-rw-r--r-- | daemons/clvmd/refresh_clvmd.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/daemons/clvmd/refresh_clvmd.c b/daemons/clvmd/refresh_clvmd.c index 24d29fbe..c1c3aa6f 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) |