mirror of
git://sourceware.org/git/lvm2.git
synced 2025-02-27 01:57:55 +03:00
Use suspend|resume_origin_only when up-converting RAID LVs, as mirrors do.
Failure to do so results in "Performing unsafe table load while X device(s) are known to be suspended" errors. While fixing the problem in this way works and is consistent with the way the mirror segment type does it, it would be nice to find a solution that uses the generic suspend/resume calls. Also included in this check-in are additions to the test suite that perform conversions on RAID LVs under a snapshot. These tests are disabled for the time being due to a kernel bug that is yet to be tracked down.
This commit is contained in:
parent
6979dccd79
commit
cb09dc1274
@ -1,5 +1,6 @@
|
||||
Version 2.02.89 -
|
||||
==================================
|
||||
Use suspend|resume_origin_only when up-converting RAID, as mirrors do.
|
||||
Fix the way RAID meta LVs are added to the dependency tree.
|
||||
Change exclusive LV activation logic to try local node before remote nodes.
|
||||
Add CLVMD_FLAG_REMOTE to skip processing on local node.
|
||||
|
@ -762,7 +762,7 @@ to be left for these sub-lvs.
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!suspend_lv(cmd, lv)) {
|
||||
if (!suspend_lv_origin(cmd, lv)) {
|
||||
log_error("Failed to suspend %s/%s before committing changes",
|
||||
lv->vg->name, lv->name);
|
||||
return 0;
|
||||
@ -774,7 +774,7 @@ to be left for these sub-lvs.
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!resume_lv(cmd, lv)) {
|
||||
if (!resume_lv_origin(cmd, lv)) {
|
||||
log_error("Failed to resume %s/%s after committing changes",
|
||||
lv->vg->name, lv->name);
|
||||
return 0;
|
||||
|
@ -25,10 +25,14 @@ function is_in_sync()
|
||||
if ! a=(`dmsetup status $dm_name`); then
|
||||
echo "Unable to get sync status of $1"
|
||||
exit 1
|
||||
elif [ ${a[2]} = "snapshot-origin" ]; then
|
||||
if ! a=(`dmsetup status ${dm_name}-real`); then
|
||||
echo "Unable to get sync status of $1"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# 6th argument is the sync ratio for RAID and mirror
|
||||
echo ${a[@]}
|
||||
if [ ${a[2]} = "raid" ]; then
|
||||
# Last argument is the sync ratio for RAID
|
||||
idx=$((${#a[@]} - 1))
|
||||
@ -103,6 +107,11 @@ aux prepare_vg 5 80
|
||||
###########################################
|
||||
# RAID1 convert tests
|
||||
###########################################
|
||||
#
|
||||
# FIXME: Snapshots of RAID is available, but there are kernel bugs that
|
||||
# still prevent its use.
|
||||
#for under_snap in false true; do
|
||||
for under_snap in false; do
|
||||
for i in 1 2 3 4; do
|
||||
for j in 1 2 3 4; do
|
||||
if [ $i -eq 1 ]; then
|
||||
@ -115,7 +124,13 @@ for i in 1 2 3 4; do
|
||||
else
|
||||
to="$j-way"
|
||||
fi
|
||||
echo "Converting from $from to $to"
|
||||
|
||||
echo -n "Converting from $from to $to"
|
||||
if $under_snap; then
|
||||
echo -n " (while under a snapshot)"
|
||||
fi
|
||||
echo
|
||||
|
||||
if [ $i -eq 1 ]; then
|
||||
# Shouldn't be able to create with just 1 image
|
||||
not lvcreate --type raid1 -m 0 -l 2 -n $lv1 $vg
|
||||
@ -125,6 +140,11 @@ for i in 1 2 3 4; do
|
||||
lvcreate --type raid1 -m $(($i - 1)) -l 2 -n $lv1 $vg
|
||||
wait_for_sync $vg/$lv1
|
||||
fi
|
||||
|
||||
if $under_snap; then
|
||||
lvcreate -s $vg/$lv1 -n snap -l 2
|
||||
fi
|
||||
|
||||
lvconvert -m $((j - 1)) $vg/$lv1
|
||||
|
||||
# FIXME: ensure no residual devices
|
||||
@ -135,7 +155,7 @@ for i in 1 2 3 4; do
|
||||
lvremove -ff $vg
|
||||
done
|
||||
done
|
||||
|
||||
done
|
||||
#
|
||||
# FIXME: Add tests that specify particular devices to be removed
|
||||
#
|
||||
|
Loading…
x
Reference in New Issue
Block a user