From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13090 invoked by alias); 10 Feb 2009 11:52:41 -0000 Received: (qmail 13075 invoked by uid 9452); 10 Feb 2009 11:52:41 -0000 Date: Tue, 10 Feb 2009 11:52:00 -0000 Message-ID: <20090210115241.13073.qmail@sourceware.org> From: ccaulfield@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/clvmd-cman.c da ... 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: 2009-02/txt/msg00007.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: ccaulfield@sourceware.org 2009-02-10 11:52:40 Modified files: . : WHATS_NEW daemons/clvmd : clvmd-cman.c clvmd-corosync.c Log message: Allow clvmd to start up if its lockspace already exists. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1038&r2=1.1039 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-cman.c.diff?cvsroot=lvm2&r1=1.24&r2=1.25 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-corosync.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3 --- LVM2/WHATS_NEW 2009/02/09 09:45:49 1.1038 +++ LVM2/WHATS_NEW 2009/02/10 11:52:40 1.1039 @@ -1,5 +1,6 @@ Version 2.02.45 - =================================== + Allow clvmd to start up if its lockspace already exists. Separate PV label attributes which do not need parse metadata when reporting. Remove external dependency on the 'cut' command in fsadm. Fix pvs segfault when pv mda attributes requested for not available PV. --- LVM2/daemons/clvmd/clvmd-cman.c 2008/11/04 16:41:47 1.24 +++ LVM2/daemons/clvmd/clvmd-cman.c 2009/02/10 11:52:40 1.25 @@ -110,8 +110,13 @@ /* Create a lockspace for LV & VG locks to live in */ lockspace = dlm_create_lockspace(LOCKSPACE_NAME, 0600); if (!lockspace) { - syslog(LOG_ERR, "Unable to create lockspace for CLVM: %m"); - return -1; + if (errno == EEXIST) { + lockspace = dlm_open_lockspace(LOCKSPACE_NAME); + } + if (!lockspace) { + syslog(LOG_ERR, "Unable to create lockspace for CLVM: %m"); + return -1; + } } dlm_ls_pthread_init(lockspace); DEBUGLOG("DLM initialisation complete\n"); --- LVM2/daemons/clvmd/clvmd-corosync.c 2009/02/02 14:34:25 1.2 +++ LVM2/daemons/clvmd/clvmd-corosync.c 2009/02/10 11:52:40 1.3 @@ -314,9 +314,14 @@ /* Create a lockspace for LV & VG locks to live in */ lockspace = dlm_create_lockspace(LOCKSPACE_NAME, 0600); if (!lockspace) { - syslog(LOG_ERR, "Unable to create lockspace for CLVM: %m"); - quorum_finalize(quorum_handle); - return -1; + if (errno == EEXIST) { + lockspace = dlm_open_lockspace(LOCKSPACE_NAME); + } + if (!lockspace) { + syslog(LOG_ERR, "Unable to create lockspace for CLVM: %m"); + quorum_finalize(quorum_handle); + return -1; + } } dlm_ls_pthread_init(lockspace); DEBUGLOG("DLM initialisation complete\n");