RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-18 21:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62189 from idryomov/wip-66419

Browse Source 
qa/workunits/rbd: wait for resize to be applied in rbd-nbd

Reviewed-by: Ramana Raja <rraja@redhat.com>
This commit is contained in:
Ilya Dryomov 2025-03-10 17:02:08 +01:00 committed by GitHub
commit a78961357a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qa/workunits/rbd/luks-encryption.sh
View File

@ -30,6 +30,20 @@ function expect_false() {
if "$@"; then return 1; else return 0; fi
}
function wait_for_blockdev_size() {
local dev=$1
local size=$2
for s in 0.25 0.5 0.75 1 1.25 1.5 1.75 2 2.25 2.5 2.75 3 3.25 3.5 3.75; do
if (( $(sudo blockdev --getsize64 $dev) == $size )); then
return 0
fi
sleep $s
done
return 1
}
function test_encryption_format() {
local format=$1
@ -62,7 +76,7 @@ function test_encryption_format() {
(( $(sudo blockdev --getsize64 $LIBRBD_DEV) < (32 << 20) ))
expect_false rbd resize --size 32M testimg
rbd resize --size 32M --encryption-passphrase-file /tmp/passphrase testimg
(( $(sudo blockdev --getsize64 $LIBRBD_DEV) == (32 << 20) ))
wait_for_blockdev_size $LIBRBD_DEV $((32 << 20))
_sudo rbd device unmap -t nbd $LIBRBD_DEV
sudo cryptsetup close cryptsetupdev

17
qa/workunits/rbd/rbd-nbd.sh
View File

@ -122,6 +122,20 @@ unmap_device()
sleep 0.5
}
function wait_for_blockdev_size() {
local dev=$1
local size=$2
for s in 0.25 0.5 0.75 1 1.25 1.5 1.75 2 2.25 2.5 2.75 3 3.25 3.5 3.75; do
if (( $(sudo blockdev --getsize64 $dev) == $size )); then
return 0
fi
sleep $s
done
return 1
}
#
# main
#
@ -210,11 +224,12 @@ devname=$(basename ${DEV})
blocks=$(awk -v dev=${devname} '$4 == dev {print $3}' /proc/partitions)
test -n "${blocks}"
rbd resize ${POOL}/${IMAGE} --size $((SIZE * 2))M
rbd info ${POOL}/${IMAGE}
wait_for_blockdev_size ${DEV} $(((SIZE * 2) << 20))
blocks2=$(awk -v dev=${devname} '$4 == dev {print $3}' /proc/partitions)
test -n "${blocks2}"
test ${blocks2} -eq $((blocks * 2))
rbd resize ${POOL}/${IMAGE} --allow-shrink --size ${SIZE}M
wait_for_blockdev_size ${DEV} $((SIZE << 20))
blocks2=$(awk -v dev=${devname} '$4 == dev {print $3}' /proc/partitions)
test -n "${blocks2}"
test ${blocks2} -eq ${blocks}