shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

Add mutex to dmeventd_mirror to avoid concurrent execution.

Browse Source
This commit is contained in:
Alasdair Kergon 2006-07-04 18:57:27 +00:00
parent 43137a6b7f
commit f1dc5cc99b
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WHATS_NEW
View File

@ -1,5 +1,7 @@
Version 2.02.07 - Version 2.02.07 -
================================= =================================
Add mutex to dmeventd_mirror to avoid concurrent execution.
Fix vgreduce --removemissing to return success if VG is already consistent.
Fix return code if VG specified on command line is not found. Fix return code if VG specified on command line is not found.
Fix PV tools to include orphaned PVs in default output again. Fix PV tools to include orphaned PVs in default output again.
Fixed unaligned access when using clvm. Fixed unaligned access when using clvm.

7
daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
View File

@ -31,6 +31,8 @@
#define ME_INSYNC 1 #define ME_INSYNC 1
#define ME_FAILURE 2 #define ME_FAILURE 2
static pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER;
/* FIXME: We may need to lock around operations to these */ /* FIXME: We may need to lock around operations to these */
static int register_count = 0; static int register_count = 0;
static struct dm_pool *mem_pool = NULL; static struct dm_pool *mem_pool = NULL;
@ -150,6 +152,10 @@ void process_event(const char *device, enum dm_event_type event)
char *target_type = NULL; char *target_type = NULL;
char *params; char *params;
if (pthread_mutex_trylock(&_lock)) {
syslog(LOG_NOTICE, "Another thread is handling an event. Waiting...");
pthread_mutex_lock(&_lock);
}
/* FIXME Move inside libdevmapper */ /* FIXME Move inside libdevmapper */
if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) { if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) {
syslog(LOG_ERR, "Unable to create dm_task.\n"); syslog(LOG_ERR, "Unable to create dm_task.\n");
@ -204,6 +210,7 @@ void process_event(const char *device, enum dm_event_type event)
fail: fail:
if (dmt) if (dmt)
dm_task_destroy(dmt); dm_task_destroy(dmt);
pthread_mutex_unlock(&_lock);
} }
int register_device(const char *device) int register_device(const char *device)

7
dmeventd/mirror/dmeventd_mirror.c
View File

@ -31,6 +31,8 @@
#define ME_INSYNC 1 #define ME_INSYNC 1
#define ME_FAILURE 2 #define ME_FAILURE 2
static pthread_mutex_t _lock = PTHREAD_MUTEX_INITIALIZER;
/* FIXME: We may need to lock around operations to these */ /* FIXME: We may need to lock around operations to these */
static int register_count = 0; static int register_count = 0;
static struct dm_pool *mem_pool = NULL; static struct dm_pool *mem_pool = NULL;
@ -150,6 +152,10 @@ void process_event(const char *device, enum dm_event_type event)
char *target_type = NULL; char *target_type = NULL;
char *params; char *params;
if (pthread_mutex_trylock(&_lock)) {
syslog(LOG_NOTICE, "Another thread is handling an event. Waiting...");
pthread_mutex_lock(&_lock);
}
/* FIXME Move inside libdevmapper */ /* FIXME Move inside libdevmapper */
if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) { if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) {
syslog(LOG_ERR, "Unable to create dm_task.\n"); syslog(LOG_ERR, "Unable to create dm_task.\n");
@ -204,6 +210,7 @@ void process_event(const char *device, enum dm_event_type event)
fail: fail:
if (dmt) if (dmt)
dm_task_destroy(dmt); dm_task_destroy(dmt);
pthread_mutex_unlock(&_lock);
} }
int register_device(const char *device) int register_device(const char *device)