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

dmeventd: Start merging back replacement unmonitor code.

Browse Source
This commit is contained in:
Alasdair G Kergon 2016-08-23 11:30:34 +01:00
parent 952e413328
commit 97ee5a1cd3
1 changed files with 31 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/activate/activate.c
View File

@ -1690,48 +1690,6 @@ int target_register_events(struct cmd_context *cmd, const char *dso, const struc
#endif #endif
#ifdef DMEVENTD
/* FIXME Restructure all this code so that unmonitoring works cleanly regardless of current target type. */
static int _segment_independent_unmonitor(struct cmd_context *cmd, const struct logical_volume *lv, const char *dso)
{
int i, pending = 0, monitored;
int r;
log_verbose("Not monitoring %s with %s%s", display_lvname(lv), dso, test_mode() ? " [Test mode: skipping this]" : "");
/* FIXME Test mode should really continue a bit further. */
if (test_mode())
return 1;
if (!target_register_events(cmd, dso, lv, 0, 0, 0)) {
log_error("%s: segment unmonitoring function failed.",
display_lvname(lv));
return 0;
}
/* Check [un]monitor results */
/* Try a couple times if pending, but not forever... */
for (i = 0; i < 40; i++) {
pending = 0;
monitored = _device_registered_with_dmeventd(cmd, lv, &pending, NULL);
if (pending || monitored)
log_very_verbose("%s unmonitoring still pending: waiting...",
display_lvname(lv));
else
break;
usleep(10000 * i);
}
r = !monitored;
if (!r && !error_message_produced())
log_error("Not monitoring %s failed.", display_lvname(lv));
return r;
}
#endif
/* /*
* Returns 0 if an attempt to (un)monitor the device failed. * Returns 0 if an attempt to (un)monitor the device failed.
* Returns 1 otherwise. * Returns 1 otherwise.
@ -1750,6 +1708,7 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume
static const struct lv_activate_opts zlaopts = { 0 }; static const struct lv_activate_opts zlaopts = { 0 };
struct lvinfo info; struct lvinfo info;
const char *dso; const char *dso;
int new_unmonitor;
if (!laopts) if (!laopts)
laopts = &zlaopts; laopts = &zlaopts;
@ -1867,6 +1826,7 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume
monitored = (pending) ? 0 : monitored; monitored = (pending) ? 0 : monitored;
monitor_fn = NULL; monitor_fn = NULL;
new_unmonitor = 0;
if (monitor) { if (monitor) {
if (monitored) if (monitored)
@ -1881,15 +1841,28 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume
* Divert unmonitor away from code that depends on the new segment * Divert unmonitor away from code that depends on the new segment
* type instead of the existing one if it's changing. * type instead of the existing one if it's changing.
*/ */
return _segment_independent_unmonitor(cmd, lv, dso); new_unmonitor = 1;
else if (seg->segtype->ops->target_unmonitor_events) else if (seg->segtype->ops->target_unmonitor_events)
monitor_fn = seg->segtype->ops->target_unmonitor_events; monitor_fn = seg->segtype->ops->target_unmonitor_events;
} }
/* Do [un]monitor */ if (new_unmonitor) {
if (!monitor_fn) log_verbose("Not monitoring %s with %s%s", display_lvname(lv), dso, test_mode() ? " [Test mode: skipping this]" : "");
continue;
/* FIXME Test mode should really continue a bit further. */
if (test_mode())
return 1;
if (!target_register_events(cmd, dso, lv, 0, 0, 0)) {
log_error("%s: segment unmonitoring failed.",
display_lvname(lv));
return 0;
}
} else if (!monitor_fn)
continue;
else if (monitor_fn) {
log_verbose("%sonitoring %s%s", monitor ? "M" : "Not m", display_lvname(lv), log_verbose("%sonitoring %s%s", monitor ? "M" : "Not m", display_lvname(lv),
test_mode() ? " [Test mode: skipping this]" : ""); test_mode() ? " [Test mode: skipping this]" : "");
@ -1903,6 +1876,7 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume
display_lvname(lv), seg->segtype->name); display_lvname(lv), seg->segtype->name);
return 0; return 0;
} }
}
/* Check [un]monitor results */ /* Check [un]monitor results */
/* Try a couple times if pending, but not forever... */ /* Try a couple times if pending, but not forever... */