From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21184 invoked by alias); 21 Jun 2010 10:45:19 -0000 Received: (qmail 21155 invoked by uid 9664); 21 Jun 2010 10:45:18 -0000 Date: Mon, 21 Jun 2010 10:45:00 -0000 Message-ID: <20100621104518.21153.qmail@sourceware.org> From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/refresh_clvmd.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-06/txt/msg00025.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2010-06-21 10:45:17 Modified files: . : WHATS_NEW daemons/clvmd : refresh_clvmd.c Log message: 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). Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1620&r2=1.1621 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/refresh_clvmd.c.diff?cvsroot=lvm2&r1=1.10&r2=1.11 --- LVM2/WHATS_NEW 2010/06/21 08:54:32 1.1620 +++ LVM2/WHATS_NEW 2010/06/21 10:45:15 1.1621 @@ -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. --- LVM2/daemons/clvmd/refresh_clvmd.c 2010/06/15 11:00:45 1.10 +++ LVM2/daemons/clvmd/refresh_clvmd.c 2010/06/21 10:45:16 1.11 @@ -327,8 +327,21 @@ 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)