diff options
Diffstat (limited to 'lib/cache/lvmetad.c')
| -rw-r--r-- | lib/cache/lvmetad.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index 623a1a390..003c00813 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -1693,11 +1693,6 @@ int lvmetad_pvscan_single(struct cmd_context *cmd, struct device *dev, if (!baton.vg) lvmcache_fmt(info)->ops->destroy_instance(baton.fid); - /* - * NB. If this command failed and we are relying on lvmetad to have an - * *exact* image of the system, the lvmetad instance that went out of - * sync needs to be killed. - */ if (!lvmetad_pv_found((const struct id *) &dev->pvid, dev, lvmcache_fmt(info), label->sector, baton.vg, handler)) { release_vg(baton.vg); @@ -1742,13 +1737,13 @@ static int _lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler struct dev_iter *iter; struct device *dev; daemon_reply reply; - int r = 1; char *future_token; const char *reason; int was_silent; int replacing_other_update = 0; int replaced_update = 0; int retries = 0; + int ret = 1; if (!lvmetad_used()) { log_error("Cannot proceed since lvmetad is not active."); @@ -1806,7 +1801,7 @@ static int _lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler log_debug_lvmetad("Telling lvmetad to clear its cache"); reply = _lvmetad_send(cmd, "pv_clear_all", NULL); if (!_lvmetad_handle_reply(reply, "pv_clear_all", "", NULL)) - r = 0; + ret = 0; daemon_reply_destroy(reply); was_silent = silent_mode(); @@ -1814,33 +1809,38 @@ static int _lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler while ((dev = dev_iter_get(iter))) { if (sigint_caught()) { - r = 0; + ret = 0; stack; break; } if (!lvmetad_pvscan_single(cmd, dev, handler, ignore_obsolete)) - r = 0; + ret = 0; } init_silent(was_silent); dev_iter_destroy(iter); + if (!ret) + lvmetad_set_disabled(cmd, LVMETAD_DISABLE_REASON_SCANERROR); + _lvmetad_token = future_token; - if (!_token_update(NULL)) + if (!_token_update(NULL)) { + log_error("Failed to update lvmetad token after device scan."); return 0; + } /* * If lvmetad is disabled, and no lvm1 metadata was seen and no * duplicate PVs were seen, then re-enable lvmetad. */ - if (lvmetad_is_disabled(cmd, &reason) && + if (ret && lvmetad_is_disabled(cmd, &reason) && !lvmcache_found_duplicate_pvs() && !_found_lvm1_metadata) { log_debug_lvmetad("Enabling lvmetad which was previously disabled."); lvmetad_clear_disabled(cmd); } - return r; + return ret; } int lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler handler, int do_wait) @@ -2222,6 +2222,15 @@ int lvmetad_vg_is_foreign(struct cmd_context *cmd, const char *vgname, const cha return ret; } +/* + * FIXME: if we fail to disable lvmetad, then other commands could + * potentially use incorrect cache data from lvmetad. Should we + * do something more severe if the disable messages fails, like + * sending SIGKILL to the lvmetad pid? + * + * FIXME: log something in syslog any time we disable lvmetad? + * At a minimum if we fail to disable lvmetad. + */ void lvmetad_set_disabled(struct cmd_context *cmd, const char *reason) { daemon_reply reply; @@ -2306,6 +2315,9 @@ int lvmetad_is_disabled(struct cmd_context *cmd, const char **reason) } else if (strstr(reply_reason, LVMETAD_DISABLE_REASON_DUPLICATES)) { *reason = "duplicate PVs were found"; + } else if (strstr(reply_reason, LVMETAD_DISABLE_REASON_SCANERROR)) { + *reason = "scanning devices failed"; + } else { *reason = "<unknown>"; } |