diff options
| -rw-r--r-- | WHATS_NEW | 5 | ||||
| -rw-r--r-- | daemons/clvmd/clvmd-command.c | 8 | ||||
| -rw-r--r-- | daemons/clvmd/lvm-functions.c | 10 | ||||
| -rw-r--r-- | daemons/clvmd/lvm-functions.h | 1 | ||||
| -rw-r--r-- | lib/cache/lvmcache.c | 2 |
5 files changed, 21 insertions, 5 deletions
@@ -1,13 +1,14 @@ Version 2.02.38 - ================================= - Fix uninitialised mutex in clvmd if all daemons are not running at startup. Make clvmd-cman use a hash rather than an array for node updown info. Check lv_count in vg_validate. Add --prefixes to reporting tools for field name prefix output format. Version 2.02.37 - ================================= - Avoid unnecessary unlock attempts with LCK_CACHE pseudo-locks. + Add missing mutex around clvmd lvmcache_drop_metadata library call. + Fix uninitialised mutex in clvmd if all daemons are not running at startup. + Avoid using DLM locks with LCK_CACHE type P_ lock requests. When asked to drop cached committed VG metadata, invalidate cached PV labels. Drop metadata cache before writing precommitted metadata instead of after. Don't touch /dev in vgrename if activation is disabled. diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c index b47f5273..8e544e90 100644 --- a/daemons/clvmd/clvmd-command.c +++ b/daemons/clvmd/clvmd-command.c @@ -122,7 +122,7 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen, if (strcmp(lockname, "P_#global") == 0) do_refresh_cache(); else if (strncmp(lockname, "P_", 2) == 0) - lvmcache_drop_metadata(lockname + 2); + drop_metadata(lockname + 2); break; @@ -253,7 +253,11 @@ int do_pre_command(struct local_client *client) break; case CLVMD_CMD_LOCK_VG: - status = lock_vg(client); + lockname = &args[2]; + /* Do not use lock for cache related commands */ + if (!strncmp(lockname, "V_", 2) || + !strcmp(lockname, "P_#global")) + status = lock_vg(client); break; case CLVMD_CMD_LOCK_LV: diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 3cfce8e3..08c370be 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -500,6 +500,16 @@ static void drop_vg_locks() } /* + * Drop lvmcache metadata + */ +void drop_metadata(const char *vgname) +{ + pthread_mutex_lock(&lvm_lock); + lvmcache_drop_metadata(vgname); + pthread_mutex_unlock(&lvm_lock); +} + +/* * Ideally, clvmd should be started before any LVs are active * but this may not be the case... * I suppose this also comes in handy if clvmd crashes, not that it would! diff --git a/daemons/clvmd/lvm-functions.h b/daemons/clvmd/lvm-functions.h index 01d5d831..bf42dbe6 100644 --- a/daemons/clvmd/lvm-functions.h +++ b/daemons/clvmd/lvm-functions.h @@ -33,5 +33,6 @@ extern int hold_unlock(char *resource); extern int hold_lock(char *resource, int mode, int flags); extern void unlock_all(void); extern char *get_last_lvm_error(void); +extern void drop_metadata(const char *vgname); #endif diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 3fc5c97a..bc0b3d32 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -158,7 +158,7 @@ static void _drop_metadata(const char *vgname) void lvmcache_drop_metadata(const char *vgname) { /* For VG_ORPHANS, we need to invalidate all labels on orphan PVs. */ - if (strcmp(vgname, VG_ORPHANS)) { + if (!strcmp(vgname, VG_ORPHANS)) { _drop_metadata(FMT_TEXT_ORPHAN_VG_NAME); _drop_metadata(FMT_LVM1_ORPHAN_VG_NAME); _drop_metadata(FMT_POOL_ORPHAN_VG_NAME); |