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

When removing a snapshot avoid preloading the origin if the

Browse Source 
snapshot-merge target is not active.
This commit is contained in:
Mike Snitzer 2010-04-23 02:57:39 +00:00
parent 616eda51e3
commit 1f661c5dd8
5 changed files with 40 additions and 12 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.64 - Version 2.02.64 -
================================= =================================
Don't preload the origin when removing a snapshot whose merge is pending.
Disallow the addition of mirror images while a conversion is happening. Disallow the addition of mirror images while a conversion is happening.
Disallow primary mirror image removal when mirror is not in-sync. Disallow primary mirror image removal when mirror is not in-sync.
Remove obsolete --name parameter from vgcfgrestore. Remove obsolete --name parameter from vgcfgrestore.

3
lib/activate/activate.h
View File

@ -95,6 +95,9 @@ int lvs_in_vg_opened(const struct volume_group *vg);
int lv_is_active(struct logical_volume *lv); int lv_is_active(struct logical_volume *lv);
int lv_has_target_type(struct dm_pool *mem, struct logical_volume *lv,
const char *layer, const char *target_type);
int monitor_dev_for_events(struct cmd_context *cmd, int monitor_dev_for_events(struct cmd_context *cmd,
struct logical_volume *lv, int do_reg); struct logical_volume *lv, int do_reg);

10
lib/activate/dev_manager.c
View File

@ -329,10 +329,8 @@ static int _status(const char *name, const char *uuid,
return 0; return 0;
} }
static int _lv_has_target_type(struct dev_manager *dm, int lv_has_target_type(struct dm_pool *mem, struct logical_volume *lv,
struct logical_volume *lv, const char *layer, const char *target_type)
const char *layer,
const char *target_type)
{ {
int r = 0; int r = 0;
char *dlid; char *dlid;
@ -343,7 +341,7 @@ static int _lv_has_target_type(struct dev_manager *dm,
char *type = NULL; char *type = NULL;
char *params = NULL; char *params = NULL;
if (!(dlid = build_dm_uuid(dm->mem, lv->lvid.s, layer))) if (!(dlid = build_dm_uuid(mem, lv->lvid.s, layer)))
return_0; return_0;
if (!(dmt = _setup_task(NULL, dlid, 0, if (!(dmt = _setup_task(NULL, dlid, 0,
@ -1183,7 +1181,7 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
((dinfo = _cached_info(dm->mem, find_merging_cow(lv)->cow, ((dinfo = _cached_info(dm->mem, find_merging_cow(lv)->cow,
dtree)) && dinfo->open_count)) { dtree)) && dinfo->open_count)) {
/* FIXME Is there anything simpler to check for instead? */ /* FIXME Is there anything simpler to check for instead? */
if (!_lv_has_target_type(dm, lv, NULL, "snapshot-merge")) if (!lv_has_target_type(dm->mem, lv, NULL, "snapshot-merge"))
clear_snapshot_merge(lv); clear_snapshot_merge(lv);
} }
} }

9
lib/metadata/snapshot_manip.c
View File

@ -18,6 +18,7 @@
#include "locking.h" #include "locking.h"
#include "toolcontext.h" #include "toolcontext.h"
#include "lv_alloc.h" #include "lv_alloc.h"
#include "activate.h"
int lv_is_origin(const struct logical_volume *lv) int lv_is_origin(const struct logical_volume *lv)
{ {
@ -176,8 +177,15 @@ int vg_remove_snapshot(struct logical_volume *cow)
dm_list_del(&cow->snapshot->origin_list); dm_list_del(&cow->snapshot->origin_list);
origin->origin_count--; origin->origin_count--;
if (find_merging_cow(origin) == find_cow(cow)) { if (find_merging_cow(origin) == find_cow(cow)) {
clear_snapshot_merge(origin); clear_snapshot_merge(origin);
/*
* preload origin IFF "snapshot-merge" target is active
* - IMPORTANT: avoids preload if onactivate merge is pending
*/
if (lv_has_target_type(origin->vg->cmd->mem, origin, NULL,
"snapshot-merge")) {
/* /*
* preload origin to: * preload origin to:
* - allow proper release of -cow * - allow proper release of -cow
@ -187,6 +195,7 @@ int vg_remove_snapshot(struct logical_volume *cow)
*/ */
preload_origin = 1; preload_origin = 1;
} }
}
if (!lv_remove(cow->snapshot->lv)) { if (!lv_remove(cow->snapshot->lv)) {
log_error("Failed to remove internal snapshot LV %s", log_error("Failed to remove internal snapshot LV %s",

17
test/t-snapshot-merge.sh
View File

@ -76,6 +76,23 @@ dmsetup table ${vg}-${lv1} | grep -q " snapshot-merge "
lvremove -f $vg/$lv1 lvremove -f $vg/$lv1
# "onactivate merge" test
# -- deactivate/remove after disallowed merge attempt, tests
# to make sure preload of origin's metadata is _not_ performed
setup_merge $vg $lv1
lvs -a
mkdir test_mnt
mount $(lvdev_ $vg $lv1) test_mnt
lvconvert --merge $vg/$(snap_lv_name_ $lv1)
# -- refresh LV while FS is still mounted (merge must not start),
# verify 'snapshot-origin' target is still being used
lvchange --refresh $vg/$lv1
umount test_mnt
rm -r test_mnt
dmsetup table ${vg}-${lv1} | grep -q " snapshot-origin "
lvremove -f $vg/$lv1
# test multiple snapshot merge; tests copy out that is driven by merge # test multiple snapshot merge; tests copy out that is driven by merge
setup_merge $vg $lv1 1 setup_merge $vg $lv1 1
lvs -a lvs -a