mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-02 01:18:26 +03:00
lvmetad: improve error message for VGs with same name
This commit is contained in:
parent
485d2ca945
commit
4d37db123d
15
lib/cache/lvmetad.c
vendored
15
lib/cache/lvmetad.c
vendored
@ -316,6 +316,15 @@ static int _lvmetad_handle_reply(daemon_reply reply, const char *action, const c
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Multiple VGs with the same name were found. */
|
||||||
|
if (found && !strcmp(daemon_reply_str(reply, "response", ""), "multiple")) {
|
||||||
|
log_very_verbose("Request to %s %s%sin lvmetad found multiple matching objects.",
|
||||||
|
action, object, *object ? " " : "");
|
||||||
|
if (found)
|
||||||
|
*found = 2;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
log_error("Request to %s %s%sin lvmetad gave response %s. Reason: %s",
|
log_error("Request to %s %s%sin lvmetad gave response %s. Reason: %s",
|
||||||
action, object, *object ? " " : "",
|
action, object, *object ? " " : "",
|
||||||
daemon_reply_str(reply, "response", "<missing>"),
|
daemon_reply_str(reply, "response", "<missing>"),
|
||||||
@ -527,6 +536,12 @@ struct volume_group *lvmetad_vg_lookup(struct cmd_context *cmd, const char *vgna
|
|||||||
|
|
||||||
if (_lvmetad_handle_reply(reply, "lookup VG", diag_name, &found) && found) {
|
if (_lvmetad_handle_reply(reply, "lookup VG", diag_name, &found) && found) {
|
||||||
|
|
||||||
|
if ((found == 2) && vgname) {
|
||||||
|
log_error("Multiple VGs found with the same name: %s.", vgname);
|
||||||
|
log_error("See the --select option with VG UUID (vg_uuid).");
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
if (!(top = dm_config_find_node(reply.cft->root, "metadata"))) {
|
if (!(top = dm_config_find_node(reply.cft->root, "metadata"))) {
|
||||||
log_error(INTERNAL_ERROR "metadata config node not found.");
|
log_error(INTERNAL_ERROR "metadata config node not found.");
|
||||||
goto out;
|
goto out;
|
||||||
|
Loading…
Reference in New Issue
Block a user