mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-18 10:04:20 +03:00
vgcfgrestore should not quietly fail when backup file has missing PVs.
(fixes previous commit: Fix segfault for vgcfgrestore on VG with missing PVs.)
This commit is contained in:
parent
761e574190
commit
0a5e42897e
@ -335,7 +335,7 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name,
|
|||||||
const char *file)
|
const char *file)
|
||||||
{
|
{
|
||||||
struct volume_group *vg;
|
struct volume_group *vg;
|
||||||
int r = 0;
|
int missing_pvs, r = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Read in the volume group from the text file.
|
* Read in the volume group from the text file.
|
||||||
@ -343,11 +343,12 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name,
|
|||||||
if (!(vg = backup_read_vg(cmd, vg_name, file)))
|
if (!(vg = backup_read_vg(cmd, vg_name, file)))
|
||||||
return_0;
|
return_0;
|
||||||
|
|
||||||
/*
|
missing_pvs = vg_missing_pv_count(vg);
|
||||||
* If PV is missing, there is already message from read above
|
if (missing_pvs == 0)
|
||||||
*/
|
|
||||||
if (!vg_missing_pv_count(vg))
|
|
||||||
r = backup_restore_vg(cmd, vg);
|
r = backup_restore_vg(cmd, vg);
|
||||||
|
else
|
||||||
|
log_error("Cannot restore Volume Group %s with %i PVs "
|
||||||
|
"marked as missing.", vg->name, missing_pvs);
|
||||||
|
|
||||||
vg_release(vg);
|
vg_release(vg);
|
||||||
return r;
|
return r;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user