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

vdo: enhance import script for devices file

Browse Source 
When the import is used on a system, that uses devices file,
the final activation was impossible for the case the converted
volume was not present in devices file.
Currently add volume automatically in such case.

Also add some more debugging output from the script.

TODO: Consider enhnacing lvconvert with extending devices file.
This commit is contained in:
Zdenek Kabelac 2023-09-02 21:25:20 +02:00
parent b81835b5ca
commit c693aa8dac
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/lvm_import_vdo.sh
View File

@ -121,8 +121,13 @@ dry() {
cleanup() {
trap '' 2
test -n "$VDO_DM_SNAPSHOT_NAME" && { "$DMSETUP" remove "$VDO_DM_SNAPSHOT_NAME" || true ; }
test -n "$VDO_DM_SNAPSHOT_NAME" && {
for i in {1..20} ; do
test "$("$DMSETUP" info --noheading -co open "$VDO_DM_SNAPSHOT_NAME")" = "0" && break
sleep .1
done
"$DMSETUP" remove "$VDO_DM_SNAPSHOT_NAME" || true
}
test -n "$VDO_SNAPSHOT_LOOP" && { "$LOSETUP" -d "$VDO_SNAPSHOT_LOOP" || true ; }
test -z "$PROMPTING" || echo "No"
@ -370,7 +375,13 @@ convert_non_lv_() {
fi
verbose "Moving VDO header."
output=$(dry "$VDO" convert $VDOCONF $VERB --force --name "$VDONAME")
output=$(dry "$VDO" convert $VDOCONF $VERB --force --name "$VDONAME" 2>&1) || {
echo "$output"
error "Failed to convert VDO volume \"$DEVICE\" (exit code $?)."
}
echo "$output"
if [ "$ABORT_AFTER_VDO_CONVERT" != "0" ] ; then
verbose "Aborting VDO conversion after moving VDO header, volume is useless!"
@ -456,12 +467,19 @@ convert_non_lv_() {
dry snapshot_merge_ "$DEVICE"
if [ -e "$TEMPDIR/vdo_snap.yml" ]; then
dry cp "$TEMPDIR/vdo_snap.yml" "$VDO_CONFIG"
else
elif [ -e "$VDO_CONFIG" ]; then
dry rm -f "$VDO_CONFIG"
fi
verbose "Merging of VDO device finished."
fi
output=$(dry "$LVM" pvs "$DEVICE" 2>&1) || {
if echo "$output" | grep -q "not in devices file" ; then
verbose "Adding \"$DEVICE\" to devices file."
dry "$LVM" lvmdevices --adddev "$DEVICE"
fi
}
dry "$LVM" lvchange -ay $VERB $FORCE "$VGNAME/$LVNAME"
}