add error message if vgcfg fails because og missing PVs
PATCH 1/1 add error message if vgcfg fails because og missing PVs
vgcfgrestore should not quietly fail when backup file has missing PVs.
(my previous comment in code is wrong, there are situation when vg_read prints nothing)
Signed-off-by Milan Broz <[email protected]>
--- lib/format_text/archiver.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
lib/format_text/archiver.c +6 -5
@@ -335,7 +335,7 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name, const char *file) {struct volume_group *vg; -int r =0 ; +int missing_pvs, r =0 ;/* * 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))) return_0; -/* -* If PV is missing, there is already message from read above -*/ -if (!vg_missing_pv_count (vg)) + missing_pvs =vg_missing_pv_count (vg); +if (missing_pvs ==0 ) 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);return r;
PATCH 1/1 add error message if vgcfg fails because og missing PVs
Quoted 1 line · Milan Broz
Signed-off-by Milan Broz <[email protected]>
Acked-by Petr Rockai <[email protected]>
Quoted 30 lines
lib/format_text/archiver.c +6
-5@@ -335,7 +335,7 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name, const char *file) {struct volume_group *vg; -int r =0 ; +int missing_pvs, r =0 ;/* * 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))) return_0; -/* -* If PV is missing, there is already message from read above -*/ -if (!vg_missing_pv_count (vg)) + missing_pvs =vg_missing_pv_count (vg); +if (missing_pvs ==0 ) 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);return r;
Signature · 6 lines
Peter Rockai | me()mornfall!net | prockai()redhat!com
http://blog.mornfall.net | http://web.mornfall.net
"In My Egotistical Opinion, most people's C programs should be
indented six feet downward and covered with dirt."
-- Blair P. Houghton on the subject of C program indentation