From a3d987fa7330373c3e020e3dd46b13ad486ac96f Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 13 Oct 2008 12:06:30 +0000 Subject: [PATCH] Fix snapshot monitoring library to not cancel monitoring invalid snapshot. snapshot DSO unregistered itself when snapshot changed state to invalid. This can cause a race (and several timeouts), when for example another snapshot is added and in the middle of operation (suspend/resume) the monitoring thread unregister itself. Fix it by keeping the snapshot monitored after invalidation - just reset threshold to not really print any messages to syslog. --- WHATS_NEW | 1 + .../plugins/snapshot/dmeventd_snapshot.c | 19 ------------------- dmeventd/snapshot/dmeventd_snapshot.c | 19 ------------------- 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 05bd43c5e..f01a96abc 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.41 - ===================================== + Fix snapshot monitoring library to not cancel monitoring invalid snapshot. Generate man pages from templates and include version. Add usrlibdir and usrsbindir to configure. Fix conversion of md chunk size into sectors. diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c index 28e663a5f..3e250af27 100644 --- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c +++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c @@ -99,24 +99,6 @@ static void _parse_snapshot_params(char *params, struct snap_status *stat) stat->max = atoi(p); } -/* send unregister command to itself */ -static void _unregister_self(struct dm_task *dmt) -{ - const char *name = dm_task_get_name(dmt); - struct dm_event_handler *dmevh; - - if (!(dmevh = dm_event_handler_create())) - return; - - if (dm_event_handler_set_dev_name(dmevh, name)) - goto fail; - - dm_event_handler_set_event_mask(dmevh, DM_EVENT_ALL_ERRORS|DM_EVENT_TIMEOUT); - dm_event_unregister_handler(dmevh); -fail: - dm_event_handler_destroy(dmevh); -} - void process_event(struct dm_task *dmt, enum dm_event_mask event __attribute((unused)), void **private) @@ -149,7 +131,6 @@ void process_event(struct dm_task *dmt, */ if (stat.invalid || !stat.max) { syslog(LOG_ERR, "Snapshot %s changed state to: %s\n", device, params); - _unregister_self(dmt); *percent_warning = 0; goto out; } diff --git a/dmeventd/snapshot/dmeventd_snapshot.c b/dmeventd/snapshot/dmeventd_snapshot.c index 28e663a5f..3e250af27 100644 --- a/dmeventd/snapshot/dmeventd_snapshot.c +++ b/dmeventd/snapshot/dmeventd_snapshot.c @@ -99,24 +99,6 @@ static void _parse_snapshot_params(char *params, struct snap_status *stat) stat->max = atoi(p); } -/* send unregister command to itself */ -static void _unregister_self(struct dm_task *dmt) -{ - const char *name = dm_task_get_name(dmt); - struct dm_event_handler *dmevh; - - if (!(dmevh = dm_event_handler_create())) - return; - - if (dm_event_handler_set_dev_name(dmevh, name)) - goto fail; - - dm_event_handler_set_event_mask(dmevh, DM_EVENT_ALL_ERRORS|DM_EVENT_TIMEOUT); - dm_event_unregister_handler(dmevh); -fail: - dm_event_handler_destroy(dmevh); -} - void process_event(struct dm_task *dmt, enum dm_event_mask event __attribute((unused)), void **private) @@ -149,7 +131,6 @@ void process_event(struct dm_task *dmt, */ if (stat.invalid || !stat.max) { syslog(LOG_ERR, "Snapshot %s changed state to: %s\n", device, params); - _unregister_self(dmt); *percent_warning = 0; goto out; } -- 2.43.5