public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/lvm-functions.c Date: Thu, 05 Mar 2009 16:25:00 -0000 [thread overview] Message-ID: <20090305162537.31662.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2009-03-05 16:25:36 Modified files: . : WHATS_NEW daemons/clvmd : lvm-functions.c Log message: Fix possible increasing in memory allocation if refreshing_context (for example when CLVMD_CMD_LOCK_VG for is called during vgscan). If clvmd calls LV lock, it calls /* clean the pool for another command */ dm_pool_empty(cmd->mem); to clean up memory pool after command. Unfortunately, do_refresh_cache() do not call this and because during it operation it allocates some memory, the pool increases. Also do_refresh_cache should use lvm_lock (it manipulates with lvm internal data). The same applies for lvm_backup command. Signed-off-by: Milan Broz <mbroz@redhat.com> Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1061&r2=1.1062 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.57&r2=1.58 --- LVM2/WHATS_NEW 2009/03/03 18:25:05 1.1061 +++ LVM2/WHATS_NEW 2009/03/05 16:25:35 1.1062 @@ -1,5 +1,6 @@ Version 2.02.46 - ================================ + Flush memory pool and fix locking in clvmd refresh and backup command. Version 2.02.45 - 3rd March 2009 ================================ --- LVM2/daemons/clvmd/lvm-functions.c 2009/02/22 21:14:38 1.57 +++ LVM2/daemons/clvmd/lvm-functions.c 2009/03/05 16:25:36 1.58 @@ -406,16 +406,15 @@ DEBUGLOG("do_lock_lv: resource '%s', cmd = %s, flags = %s\n", resource, decode_locking_cmd(command), decode_flags(lock_flags)); - pthread_mutex_lock(&lvm_lock); if (!cmd->config_valid || config_files_changed(cmd)) { /* Reinitialise various settings inc. logging, filters */ if (do_refresh_cache()) { log_error("Updated config file invalid. Aborting."); - pthread_mutex_unlock(&lvm_lock); return EINVAL; } } + pthread_mutex_lock(&lvm_lock); if (lock_flags & LCK_MIRROR_NOSYNC_MODE) init_mirror_in_sync(1); @@ -538,9 +537,14 @@ DEBUGLOG("Refreshing context\n"); log_notice("Refreshing context"); + pthread_mutex_lock(&lvm_lock); + ret = refresh_toolcontext(cmd); init_full_scan_done(0); lvmcache_label_scan(cmd, 2); + dm_pool_empty(cmd->mem); + + pthread_mutex_unlock(&lvm_lock); return ret==1?0:-1; } @@ -711,14 +715,18 @@ DEBUGLOG("Triggering backup of VG metadata for %s. suspended=%d\n", vgname, suspended); + pthread_mutex_lock(&lvm_lock); + vg = vg_read_internal(cmd, vgname, NULL /*vgid*/, &consistent); - if (vg) { - if (consistent) - check_current_backup(vg); - } - else { + + if (vg && consistent) + check_current_backup(vg); + else log_error("Error backing up metadata, can't find VG for group %s", vgname); - } + + dm_pool_empty(cmd->mem); + + pthread_mutex_unlock(&lvm_lock); } /* Called to initialise the LVM context of the daemon */
next reply other threads:[~2009-03-05 16:25 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-03-05 16:25 mbroz [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-03-01 9:54 zkabelac 2012-02-23 22:50 zkabelac 2011-08-10 11:00 mbroz 2011-03-02 23:38 mbroz 2010-07-01 21:23 mbroz 2010-03-24 22:25 snitzer 2010-01-26 8:00 mbroz 2009-12-09 19:01 mbroz 2009-12-09 19:00 mbroz 2009-12-09 18:55 mbroz 2009-12-09 18:45 mbroz 2009-10-22 17:45 agk 2009-10-01 14:14 ccaulfield 2009-08-05 14:18 ccaulfield 2008-04-08 13:03 ccaulfield 2008-04-04 8:53 ccaulfield 2007-08-24 8:29 pcaulfield 2007-08-23 12:19 pcaulfield 2007-04-24 15:13 pcaulfield 2005-02-14 9:07 pcaulfield 2005-02-02 11:42 pcaulfield 2004-10-04 9:23 pcaulfield
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090305162537.31662.qmail@sourceware.org \ --to=mbroz@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).