]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/standalone: fix bluefs expand test case
authorIgor Fedotov <igor.fedotov@croit.io>
Mon, 9 Feb 2026 12:19:52 +0000 (15:19 +0300)
committerIgor Fedotov <ifedotov@croit.io>
Wed, 18 Mar 2026 16:33:43 +0000 (19:33 +0300)
Fixes: https://tracker.ceph.com/issues/74525
Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 9fc57f9ed1c61d54ca8ecd9e1b98782eee13848a)

qa/standalone/osd/osd-bluefs-volume-ops.sh

index 175425601200f8a11a33e39505ac210e043417c0..d376a3ac97a934341f61e6e5e4cefe060b593846 100755 (executable)
@@ -447,7 +447,7 @@ function TEST_bluestore_expand() {
     # expand slow devices
     ceph-bluestore-tool --log-file $dir/bluestore_tool.log --path $dir/0 fsck || return 1
 
-    requested_space=4294967296 # 4GB
+    requested_space=5368709120 # 5GB
     truncate $dir/0/block -s $requested_space
     ceph-bluestore-tool --log-file $dir/bluestore_tool.log --path $dir/0 bluefs-bdev-expand || return 1
 
@@ -467,22 +467,16 @@ function TEST_bluestore_expand() {
     total_space_after=$( ceph tell osd.0 perf dump bluefs | jq ".bluefs.slow_total_bytes" )
     free_space_after=`ceph tell osd.0 bluestore bluefs device info | grep "BDEV_SLOW" -A 2 | grep free | cut -d':' -f 2 | cut -d"," -f 1 | cut -d' ' -f 2`
 
-    if [ $total_space_after != $requested_space ]; then
-       echo "total_space_after = $total_space_after"
-       echo "requested_space   = $requested_space"
-       return 1;
+    if [ $total_space_after -ne $requested_space ]; then
+        echo "total_space_after = $total_space_after"
+        echo "requested_space   = $requested_space"
+        return 1;
     fi
 
-    total_space_added=$((total_space_after - total_space_before))
-    free_space_added=$((free_space_after - free_space_before))
-
-    let new_used_space=($total_space_added - $free_space_added)
-    echo $new_used_space
-    # allow upto 128KB to be consumed
-    if [ $new_used_space -gt 131072 ]; then
-       echo "total_space_added = $total_space_added"
-       echo "free_space_added  = $free_space_added"
-       return 1;
+    if [ $free_space_after -le $free_space_before ]; then
+       echo "total_space_after = $total_space_after"
+       echo "requested_space   = $requested_space"
+       return 1;
     fi
     
     # kill