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

activate: Hide errors when snapshot merge delayed.

Browse Source
This commit is contained in:
Alasdair G Kergon 2016-04-21 22:14:10 +01:00
parent 4d095c2fbb
commit 01181a299e
7 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.151 - Version 2.02.151 -
================================= =================================
Suppress errors when snapshot merge gets delayed because volume is in use.
Avoid internal snapshot LV names in messages. Avoid internal snapshot LV names in messages.
Autodetect and use /run/lock dir when available instead of /var/lock. Autodetect and use /run/lock dir when available instead of /var/lock.
lvchange --refresh for merging thin origin will retry to deactivate snapshot. lvchange --refresh for merging thin origin will retry to deactivate snapshot.

29
lib/activate/activate.c
View File

@ -763,7 +763,8 @@ int lv_info_with_seg_status(struct cmd_context *cmd, const struct logical_volume
#define OPEN_COUNT_CHECK_RETRIES 25 #define OPEN_COUNT_CHECK_RETRIES 25
#define OPEN_COUNT_CHECK_USLEEP_DELAY 200000 #define OPEN_COUNT_CHECK_USLEEP_DELAY 200000
int lv_check_not_in_use(const struct logical_volume *lv) /* Only report error if error_if_used is set */
int lv_check_not_in_use(const struct logical_volume *lv, int error_if_used)
{ {
struct lvinfo info; struct lvinfo info;
unsigned int open_count_check_retries; unsigned int open_count_check_retries;
@ -774,14 +775,22 @@ int lv_check_not_in_use(const struct logical_volume *lv)
/* If sysfs is not used, use open_count information only. */ /* If sysfs is not used, use open_count information only. */
if (dm_sysfs_dir()) { if (dm_sysfs_dir()) {
if (dm_device_has_holders(info.major, info.minor)) { if (dm_device_has_holders(info.major, info.minor)) {
log_error("Logical volume %s is used by another device.", if (error_if_used)
display_lvname(lv)); log_error("Logical volume %s is used by another device.",
display_lvname(lv));
else
log_debug_activation("Logical volume %s is used by another device.",
display_lvname(lv));
return 0; return 0;
} }
if (dm_device_has_mounted_fs(info.major, info.minor)) { if (dm_device_has_mounted_fs(info.major, info.minor)) {
log_error("Logical volume %s contains a filesystem in use.", if (error_if_used)
display_lvname(lv)); log_error("Logical volume %s contains a filesystem in use.",
display_lvname(lv));
else
log_debug_activation("Logical volume %s contains a filesystem in use.",
display_lvname(lv));
return 0; return 0;
} }
} }
@ -789,8 +798,10 @@ int lv_check_not_in_use(const struct logical_volume *lv)
open_count_check_retries = retry_deactivation() ? OPEN_COUNT_CHECK_RETRIES : 1; open_count_check_retries = retry_deactivation() ? OPEN_COUNT_CHECK_RETRIES : 1;
while (info.open_count > 0 && open_count_check_retries--) { while (info.open_count > 0 && open_count_check_retries--) {
if (!open_count_check_retries) { if (!open_count_check_retries) {
log_error("Logical volume %s in use.", if (error_if_used)
display_lvname(lv)); log_error("Logical volume %s in use.", display_lvname(lv));
else
log_debug_activation("Logical volume %s in use.", display_lvname(lv));
return 0; return 0;
} }
@ -2118,7 +2129,7 @@ static int _lv_has_open_snapshots(const struct logical_volume *lv)
int r = 0; int r = 0;
dm_list_iterate_items_gen(snap_seg, &lv->snapshot_segs, origin_list) dm_list_iterate_items_gen(snap_seg, &lv->snapshot_segs, origin_list)
if (!lv_check_not_in_use(snap_seg->cow)) if (!lv_check_not_in_use(snap_seg->cow, 1))
r++; r++;
if (r) if (r)
@ -2172,7 +2183,7 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, const struct logi
if (lv_is_visible(lv) || lv_is_virtual_origin(lv) || if (lv_is_visible(lv) || lv_is_virtual_origin(lv) ||
lv_is_merging_thin_snapshot(lv)) { lv_is_merging_thin_snapshot(lv)) {
if (!lv_check_not_in_use(lv)) if (!lv_check_not_in_use(lv, 1))
goto_out; goto_out;
if (lv_is_origin(lv) && _lv_has_open_snapshots(lv)) if (lv_is_origin(lv) && _lv_has_open_snapshots(lv))

2
lib/activate/activate.h
View File

@ -147,7 +147,7 @@ int lv_info_with_seg_status(struct cmd_context *cmd, const struct logical_volume
struct lv_with_info_and_seg_status *status, struct lv_with_info_and_seg_status *status,
int with_open_count, int with_read_ahead); int with_open_count, int with_read_ahead);
int lv_check_not_in_use(const struct logical_volume *lv); int lv_check_not_in_use(const struct logical_volume *lv, int error_if_used);
/* /*
* Returns 1 if activate_lv has been set: 1 = activate; 0 = don't. * Returns 1 if activate_lv has been set: 1 = activate; 0 = don't.

2
lib/metadata/lv_manip.c
View File

@ -5802,7 +5802,7 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
if (!lv_is_cache_pool(lv) && /* cache pool cannot be active */ if (!lv_is_cache_pool(lv) && /* cache pool cannot be active */
lv_is_active(lv)) { lv_is_active(lv)) {
if (!lv_check_not_in_use(lv)) if (!lv_check_not_in_use(lv, 1))
return_0; return_0;
if ((force == PROMPT) && if ((force == PROMPT) &&

2
tools/lvchange.c
View File

@ -344,7 +344,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv)
} }
if (lv_is_active_locally(lv)) { if (lv_is_active_locally(lv)) {
if (!lv_check_not_in_use(lv)) { if (!lv_check_not_in_use(lv, 1)) {
log_error("Can't resync open logical volume \"%s\"", log_error("Can't resync open logical volume \"%s\"",
lv->name); lv->name);
return 0; return 0;

10
tools/lvconvert.c
View File

@ -1876,7 +1876,7 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu
} }
if (lv_is_active_locally(cow)) { if (lv_is_active_locally(cow)) {
if (!lv_check_not_in_use(cow)) if (!lv_check_not_in_use(cow, 1))
return_0; return_0;
if ((lp->force == PROMPT) && !lp->yes && if ((lp->force == PROMPT) && !lp->yes &&
@ -2232,11 +2232,11 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd,
* being open. * being open.
*/ */
if (lv_is_active_locally(origin)) { if (lv_is_active_locally(origin)) {
if (!lv_check_not_in_use(origin)) { if (!lv_check_not_in_use(origin, 0)) {
log_print_unless_silent("Can't merge over open origin volume."); log_print_unless_silent("Can't merge until origin volume is closed.");
merge_on_activate = 1; merge_on_activate = 1;
} else if (!lv_check_not_in_use(lv)) { } else if (!lv_check_not_in_use(lv, 0)) {
log_print_unless_silent("Can't merge when snapshot is open."); log_print_unless_silent("Can't merge until snapshot is closed.");
merge_on_activate = 1; merge_on_activate = 1;
} }
} else if (vg_is_clustered(origin->vg) && lv_is_active(origin)) { } else if (vg_is_clustered(origin->vg) && lv_is_active(origin)) {

2
tools/vgchange.c
View File

@ -219,7 +219,7 @@ int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg,
if (!do_activate && (lv_open = lvs_in_vg_opened(vg))) { if (!do_activate && (lv_open = lvs_in_vg_opened(vg))) {
dm_list_iterate_items(lvl, &vg->lvs) dm_list_iterate_items(lvl, &vg->lvs)
if (lv_is_visible(lvl->lv) && if (lv_is_visible(lvl->lv) &&
!lv_check_not_in_use(lvl->lv)) { !lv_check_not_in_use(lvl->lv, 1)) {
log_error("Can't deactivate volume group \"%s\" with %d open " log_error("Can't deactivate volume group \"%s\" with %d open "
"logical volume(s)", vg->name, lv_open); "logical volume(s)", vg->name, lv_open);
return 0; return 0;