shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

backup: automatically store data on vg_unlock

Browse Source 
Previously there have been necessary explicit call of backup (often
either forgotten or over-used). With this patch the necessity to
store backup is remember at vg_commit and once the VG is unlocked,
the committed metadata are automatically store in backup file.

This may possibly alter some printed messages from command when the
backup is now taken later.
This commit is contained in:
Zdenek Kabelac 2021-06-08 19:39:15 +02:00
parent ba3707d953
commit bb45e33518
19 changed files with 18 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/format_text/archiver.c
View File

@ -279,7 +279,6 @@ int backup_locally(struct volume_group *vg)
int backup(struct volume_group *vg) int backup(struct volume_group *vg)
{ {
vg->needs_backup = 0;
/* Unlock memory if possible */ /* Unlock memory if possible */
memlock_unlock(vg->cmd); memlock_unlock(vg->cmd);

5
lib/locking/locking.h
View File

@ -56,8 +56,11 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags, const str
#define unlock_vg(cmd, vg, vol) \ #define unlock_vg(cmd, vg, vol) \
do { \ do { \
if (is_real_vg(vol) && !sync_local_dev_names(cmd)) \ if (is_real_vg(vol)) { \
if (!sync_local_dev_names(cmd)) \
stack; \ stack; \
vg_backup_if_needed(vg); \
} \
if (!lock_vol(cmd, vol, LCK_VG_UNLOCK, NULL)) \ if (!lock_vol(cmd, vol, LCK_VG_UNLOCK, NULL)) \
stack; \ stack; \
} while (0) } while (0)

17
lib/metadata/lv_manip.c
View File

@ -6178,8 +6178,6 @@ int lv_resize(struct logical_volume *lv,
/* Update lvm pool metadata (drop messages). */ /* Update lvm pool metadata (drop messages). */
if (!update_pool_lv(lock_lv, 0)) if (!update_pool_lv(lock_lv, 0))
goto_bad; goto_bad;
backup(vg);
} }
/* Check for over provisioning when extended */ /* Check for over provisioning when extended */
@ -7024,7 +7022,7 @@ no_remove:
static int _lv_update_and_reload(struct logical_volume *lv, int origin_only) static int _lv_update_and_reload(struct logical_volume *lv, int origin_only)
{ {
struct volume_group *vg = lv->vg; struct volume_group *vg = lv->vg;
int do_backup = 0, r = 0; int r = 0;
const struct logical_volume *lock_lv = lv_lock_holder(lv); const struct logical_volume *lock_lv = lv_lock_holder(lv);
log_very_verbose("Updating logical volume %s on disk(s)%s.", log_very_verbose("Updating logical volume %s on disk(s)%s.",
@ -7048,8 +7046,6 @@ static int _lv_update_and_reload(struct logical_volume *lv, int origin_only)
return 0; return 0;
} else if (!(r = vg_commit(vg))) } else if (!(r = vg_commit(vg)))
stack; /* !vg_commit() has implict vg_revert() */ stack; /* !vg_commit() has implict vg_revert() */
else
do_backup = 1;
log_very_verbose("Updating logical volume %s in kernel.", log_very_verbose("Updating logical volume %s in kernel.",
display_lvname(lock_lv)); display_lvname(lock_lv));
@ -7060,9 +7056,6 @@ static int _lv_update_and_reload(struct logical_volume *lv, int origin_only)
r = 0; r = 0;
} }
if (do_backup && !critical_section())
backup(vg);
return r; return r;
} }
@ -8595,8 +8588,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
/* Pool created metadata LV, but better avoid recover when vg_write/commit fails */ /* Pool created metadata LV, but better avoid recover when vg_write/commit fails */
return_NULL; return_NULL;
backup(vg);
if (test_mode()) { if (test_mode()) {
log_verbose("Test mode: Skipping activation, zeroing and signature wiping."); log_verbose("Test mode: Skipping activation, zeroing and signature wiping.");
goto out; goto out;
@ -8607,8 +8598,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
if (!lv_add_integrity_to_raid(lv, &lp->integrity_settings, lp->pvh, NULL)) if (!lv_add_integrity_to_raid(lv, &lp->integrity_settings, lp->pvh, NULL))
goto revert_new_lv; goto revert_new_lv;
backup(vg);
} }
/* Do not scan this LV until properly zeroed/wiped. */ /* Do not scan this LV until properly zeroed/wiped. */
@ -8708,7 +8697,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
goto revert_new_lv; goto revert_new_lv;
} }
} }
backup(vg);
if (!lv_active_change(cmd, lv, lp->activate)) { if (!lv_active_change(cmd, lv, lp->activate)) {
log_error("Failed to activate thin %s.", lv->name); log_error("Failed to activate thin %s.", lv->name);
@ -8829,7 +8817,6 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_NULL; /* Metadata update fails, deep troubles */ return_NULL; /* Metadata update fails, deep troubles */
backup(vg);
/* /*
* FIXME We do not actually need snapshot-origin as an active device, * FIXME We do not actually need snapshot-origin as an active device,
* as virtual origin is already 'hidden' private device without * as virtual origin is already 'hidden' private device without
@ -8873,8 +8860,6 @@ revert_new_lv:
!lv_remove(lv) || !vg_write(vg) || !vg_commit(vg)) !lv_remove(lv) || !vg_write(vg) || !vg_commit(vg))
log_error("Manual intervention may be required to remove " log_error("Manual intervention may be required to remove "
"abandoned LV(s) before retrying."); "abandoned LV(s) before retrying.");
else
backup(vg);
return NULL; return NULL;
} }

2
lib/metadata/metadata.c
View File

@ -991,6 +991,7 @@ static void _vg_move_cached_precommitted_to_committed(struct volume_group *vg)
release_vg(vg->vg_committed); release_vg(vg->vg_committed);
vg->vg_committed = vg->vg_precommitted; vg->vg_committed = vg->vg_precommitted;
vg->vg_precommitted = NULL; vg->vg_precommitted = NULL;
vg->needs_backup = 1;
} }
int lv_has_unknown_segments(const struct logical_volume *lv) int lv_has_unknown_segments(const struct logical_volume *lv)
@ -3165,7 +3166,6 @@ int vg_commit(struct volume_group *vg)
dm_list_init(&vg->msg_list); dm_list_init(&vg->msg_list);
vg->needs_write_and_commit = 0; vg->needs_write_and_commit = 0;
} }
vg->needs_backup = 0;
} }
/* If at least one mda commit succeeded, it was committed */ /* If at least one mda commit succeeded, it was committed */

1
lib/metadata/pv_manip.c
View File

@ -687,7 +687,6 @@ int pv_resize_single(struct cmd_context *cmd,
"volume group \"%s\"", pv_name, vg_name); "volume group \"%s\"", pv_name, vg_name);
goto out; goto out;
} }
backup(vg);
} }
log_print_unless_silent("Physical volume \"%s\" changed", pv_name); log_print_unless_silent("Physical volume \"%s\" changed", pv_name);

12
lib/metadata/raid_manip.c
View File

@ -2210,9 +2210,6 @@ static int _vg_write_lv_suspend_commit_backup(struct volume_group *vg,
} else if (!(r = vg_commit(vg))) } else if (!(r = vg_commit(vg)))
stack; /* !vg_commit() has implicit vg_revert() */ stack; /* !vg_commit() has implicit vg_revert() */
if (r && do_backup)
backup(vg);
return r; return r;
} }
@ -2221,8 +2218,6 @@ static int _vg_write_commit_backup(struct volume_group *vg)
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_0; return_0;
backup(vg);
return 1; return 1;
} }
@ -2847,7 +2842,6 @@ static int _raid_add_images(struct logical_volume *lv,
display_lvname(lv)); display_lvname(lv));
return 0; return 0;
} }
backup(lv->vg);
} }
return 1; return 1;
@ -3172,8 +3166,6 @@ static int _raid_remove_images(struct logical_volume *lv, int yes,
if (!lv_update_and_reload_origin(lv)) if (!lv_update_and_reload_origin(lv))
return_0; return_0;
backup(lv->vg);
return 1; return 1;
} }
@ -3431,8 +3423,6 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name,
if (!vg_write(lv->vg) || !vg_commit(lv->vg)) if (!vg_write(lv->vg) || !vg_commit(lv->vg))
return_0; return_0;
backup(lv->vg);
return 1; return 1;
} }
@ -3915,8 +3905,6 @@ static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg,
if (vg_write_requested) { if (vg_write_requested) {
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_0; return_0;
backup(vg);
} }
/* Wait for events following any deactivation. */ /* Wait for events following any deactivation. */

11
lib/metadata/vg.c
View File

@ -739,8 +739,6 @@ int vgreduce_single(struct cmd_context *cmd, struct volume_group *vg,
goto bad; goto bad;
} }
backup(vg);
log_print_unless_silent("Removed \"%s\" from volume group \"%s\"", log_print_unless_silent("Removed \"%s\" from volume group \"%s\"",
name, vg->name); name, vg->name);
} }
@ -752,3 +750,12 @@ bad:
release_vg(orphan_vg); release_vg(orphan_vg);
return r; return r;
} }
void vg_backup_if_needed(struct volume_group *vg)
{
if (!vg || !vg->needs_backup)
return;
vg->needs_backup = 0;
backup(vg->vg_committed);
}

1
lib/metadata/vg.h
View File

@ -170,6 +170,7 @@ uint32_t vg_mda_used_count(const struct volume_group *vg);
uint32_t vg_mda_copies(const struct volume_group *vg); uint32_t vg_mda_copies(const struct volume_group *vg);
int vg_set_mda_copies(struct volume_group *vg, uint32_t mda_copies); int vg_set_mda_copies(struct volume_group *vg, uint32_t mda_copies);
char *vg_profile_dup(const struct volume_group *vg); char *vg_profile_dup(const struct volume_group *vg);
void vg_backup_if_needed(struct volume_group *vg);
/* /*
* Returns visible LV count - number of LVs from user perspective * Returns visible LV count - number of LVs from user perspective

25
tools/lvconvert.c
View File

@ -1263,8 +1263,6 @@ static int _lvconvert_mirrors(struct cmd_context *cmd,
new_mimage_count, new_log_count, lp->pvh)) new_mimage_count, new_log_count, lp->pvh))
return_0; return_0;
backup(lv->vg);
if (!lp->need_polling) if (!lp->need_polling)
log_print_unless_silent("Logical volume %s converted.", log_print_unless_silent("Logical volume %s converted.",
display_lvname(lv)); display_lvname(lv));
@ -1866,8 +1864,6 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu
if (!vg_remove_snapshot(cow)) if (!vg_remove_snapshot(cow))
return_0; return_0;
backup(vg);
log_print_unless_silent("Logical Volume %s split from its origin.", display_lvname(cow)); log_print_unless_silent("Logical Volume %s split from its origin.", display_lvname(cow));
return 1; return 1;
@ -1941,8 +1937,6 @@ static int _lvconvert_split_and_keep_cachevol(struct cmd_context *cmd,
if (!vg_write(lv->vg) || !vg_commit(lv->vg)) if (!vg_write(lv->vg) || !vg_commit(lv->vg))
return_0; return_0;
backup(lv->vg);
return 1; return 1;
} }
@ -1989,8 +1983,6 @@ static int _lvconvert_split_and_keep_cachepool(struct cmd_context *cmd,
if (!vg_write(lv->vg) || !vg_commit(lv->vg)) if (!vg_write(lv->vg) || !vg_commit(lv->vg))
return_0; return_0;
backup(lv->vg);
log_print_unless_silent("Logical volume %s is not cached and %s is unused.", log_print_unless_silent("Logical volume %s is not cached and %s is unused.",
display_lvname(lv), display_lvname(lv_fast)); display_lvname(lv), display_lvname(lv_fast));
@ -2224,7 +2216,6 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd,
/* Store and commit vg but skip starting the merge */ /* Store and commit vg but skip starting the merge */
if (!vg_write(lv->vg) || !vg_commit(lv->vg)) if (!vg_write(lv->vg) || !vg_commit(lv->vg))
return_0; return_0;
backup(lv->vg);
} else { } else {
/* Perform merge */ /* Perform merge */
if (!lv_update_and_reload(origin)) if (!lv_update_and_reload(origin))
@ -2335,8 +2326,6 @@ static int _lvconvert_merge_thin_snapshot(struct cmd_context *cmd,
log_print_unless_silent("Merging of thin snapshot %s will occur on " log_print_unless_silent("Merging of thin snapshot %s will occur on "
"next activation of %s.", "next activation of %s.",
display_lvname(lv), display_lvname(origin)); display_lvname(lv), display_lvname(origin));
backup(lv->vg);
return 1; return 1;
} }
@ -2860,8 +2849,6 @@ revert_new_lv:
if (!lv_remove(thin_lv) || !vg_write(vg) || !vg_commit(vg)) if (!lv_remove(thin_lv) || !vg_write(vg) || !vg_commit(vg))
log_error("Manual intervention may be required to remove " log_error("Manual intervention may be required to remove "
"abandoned LV(s) before retrying."); "abandoned LV(s) before retrying.");
else
backup(vg);
return 0; return 0;
} }
@ -2999,7 +2986,6 @@ static int _lvconvert_swap_pool_metadata(struct cmd_context *cmd,
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_0; return_0;
backup(vg);
return 1; return 1;
} }
@ -3472,8 +3458,6 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
r = 1; r = 1;
out: out:
backup(vg);
if (r) if (r)
log_print_unless_silent("Converted %s to %s pool.", log_print_unless_silent("Converted %s to %s pool.",
converted_names, to_cachepool ? "cache" : "thin"); converted_names, to_cachepool ? "cache" : "thin");
@ -3509,8 +3493,6 @@ revert_new_lv:
if (!lv_remove(metadata_lv) || !vg_write(vg) || !vg_commit(vg)) if (!lv_remove(metadata_lv) || !vg_write(vg) || !vg_commit(vg))
log_error("Manual intervention may be required to remove " log_error("Manual intervention may be required to remove "
"abandoned LV(s) before retrying."); "abandoned LV(s) before retrying.");
else
backup(vg);
} }
return 0; return 0;
@ -5701,8 +5683,6 @@ static int _lvconvert_detach_writecache(struct cmd_context *cmd,
if (!lv_detach_writecache_cachevol(lv, noflush)) if (!lv_detach_writecache_cachevol(lv, noflush))
return_0; return_0;
backup(lv->vg);
log_print_unless_silent("Logical volume %s writecache has been detached.", log_print_unless_silent("Logical volume %s writecache has been detached.",
display_lvname(lv)); display_lvname(lv));
return 1; return 1;
@ -5827,7 +5807,6 @@ static int _lvconvert_detach_writecache_when_clean(struct cmd_context *cmd,
} }
ret = 1; ret = 1;
backup(vg);
out_release: out_release:
if (ret) if (ret)
@ -6320,8 +6299,6 @@ static int _lvconvert_integrity_remove(struct cmd_context *cmd, struct logical_v
if (!ret) if (!ret)
return_0; return_0;
backup(vg);
log_print_unless_silent("Logical volume %s has removed integrity.", display_lvname(lv)); log_print_unless_silent("Logical volume %s has removed integrity.", display_lvname(lv));
return 1; return 1;
} }
@ -6354,8 +6331,6 @@ static int _lvconvert_integrity_add(struct cmd_context *cmd, struct logical_volu
if (!ret) if (!ret)
return_0; return_0;
backup(vg);
log_print_unless_silent("Logical volume %s has added integrity.", display_lvname(lv)); log_print_unless_silent("Logical volume %s has added integrity.", display_lvname(lv));
return 1; return 1;
} }

3
tools/pvmove_poll.c
View File

@ -120,8 +120,5 @@ int pvmove_finish(struct cmd_context *cmd, struct volume_group *vg,
return 0; return 0;
} }
/* FIXME backup positioning */
backup(vg);
return 1; return 1;
} }

2
tools/toollib.c
View File

@ -3224,8 +3224,6 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
if (vg->needs_write_and_commit && (ret_max == ECMD_PROCESSED) && if (vg->needs_write_and_commit && (ret_max == ECMD_PROCESSED) &&
(!vg_write(vg) || !vg_commit(vg))) (!vg_write(vg) || !vg_commit(vg)))
ret_max = ECMD_FAILED; ret_max = ECMD_FAILED;
else if (vg->needs_backup)
backup(vg);
if (lvargs_supplied) { if (lvargs_supplied) {
/* /*

6
tools/vgchange.c
View File

@ -684,8 +684,6 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_ECMD_FAILED; return_ECMD_FAILED;
backup(vg);
log_print_unless_silent("Volume group \"%s\" successfully changed", vg->name); log_print_unless_silent("Volume group \"%s\" successfully changed", vg->name);
} }
@ -1006,8 +1004,6 @@ static int _vgchange_locktype_single(struct cmd_context *cmd, const char *vg_nam
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_ECMD_FAILED; return_ECMD_FAILED;
backup(vg);
/* /*
* When init_vg_sanlock is called for vgcreate, the lockspace remains * When init_vg_sanlock is called for vgcreate, the lockspace remains
* started and lvmlock remains active, but when called for * started and lvmlock remains active, but when called for
@ -1202,8 +1198,6 @@ static int _vgchange_systemid_single(struct cmd_context *cmd, const char *vg_nam
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_ECMD_FAILED; return_ECMD_FAILED;
backup(vg);
log_print_unless_silent("Volume group \"%s\" successfully changed", vg->name); log_print_unless_silent("Volume group \"%s\" successfully changed", vg->name);
return ECMD_PROCESSED; return ECMD_PROCESSED;

2
tools/vgcreate.c
View File

@ -167,8 +167,6 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)
unlock_vg(cmd, vg, vp_new.vg_name); unlock_vg(cmd, vg, vp_new.vg_name);
backup(vg);
log_print_unless_silent("Volume group \"%s\" successfully created%s%s", log_print_unless_silent("Volume group \"%s\" successfully created%s%s",
vg->name, vg->name,
vg->system_id ? " with system ID " : "", vg->system_id ? : ""); vg->system_id ? " with system ID " : "", vg->system_id ? : "");

2
tools/vgexport.c
View File

@ -54,8 +54,6 @@ static int vgexport_single(struct cmd_context *cmd __attribute__((unused)),
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
goto_bad; goto_bad;
backup(vg);
log_print_unless_silent("Volume group \"%s\" successfully exported", vg->name); log_print_unless_silent("Volume group \"%s\" successfully exported", vg->name);
return ECMD_PROCESSED; return ECMD_PROCESSED;

4
tools/vgextend.c
View File

@ -72,8 +72,6 @@ static int _vgextend_restoremissing(struct cmd_context *cmd __attribute__((unuse
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_ECMD_FAILED; return_ECMD_FAILED;
backup(vg);
log_print_unless_silent("Volume group \"%s\" successfully extended", vg_name); log_print_unless_silent("Volume group \"%s\" successfully extended", vg_name);
return ECMD_PROCESSED; return ECMD_PROCESSED;
@ -116,8 +114,6 @@ static int _vgextend_single(struct cmd_context *cmd, const char *vg_name,
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
goto_out; goto_out;
backup(vg);
log_print_unless_silent("Volume group \"%s\" successfully extended", vg_name); log_print_unless_silent("Volume group \"%s\" successfully extended", vg_name);
ret = ECMD_PROCESSED; ret = ECMD_PROCESSED;
out: out:

2
tools/vgimport.c
View File

@ -46,8 +46,6 @@ static int _vgimport_single(struct cmd_context *cmd,
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
goto_bad; goto_bad;
backup(vg);
log_print_unless_silent("Volume group \"%s\" successfully imported", vg->name); log_print_unless_silent("Volume group \"%s\" successfully imported", vg->name);
return ECMD_PROCESSED; return ECMD_PROCESSED;

1
tools/vgimportdevices.c
View File

@ -72,7 +72,6 @@ static int _vgimportdevices_single(struct cmd_context *cmd,
if (updated_pvs) { if (updated_pvs) {
if (!vg_write(vg) || !vg_commit(vg)) if (!vg_write(vg) || !vg_commit(vg))
goto_bad; goto_bad;
backup(vg);
} }
return ECMD_PROCESSED; return ECMD_PROCESSED;

1
tools/vgreduce.c
View File

@ -169,7 +169,6 @@ static int _vgreduce_repair_single(struct cmd_context *cmd, const char *vg_name,
return ECMD_FAILED; return ECMD_FAILED;
} }
backup(vg);
return ECMD_PROCESSED; return ECMD_PROCESSED;
} }

2
tools/vgrename.c
View File

@ -141,8 +141,6 @@ static int _vgrename_single(struct cmd_context *cmd, const char *vg_name,
lockd_rename_vg_final(cmd, vg, 1); lockd_rename_vg_final(cmd, vg, 1);
if (!backup(vg))
stack;
if (!backup_remove(cmd, vg_name)) if (!backup_remove(cmd, vg_name))
stack; stack;