From df1c59fcb8f99198210bef61d1171986533af16c Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Wed, 10 Jul 2024 09:10:02 +0200 Subject: [PATCH] qa: krbd_data_pool.sh: account for rbd_trash object ... created since commit 0bcb5cfce9a2 ("librbd/image: create rbd_trash object during RBD pool initialization"). Fixes: https://tracker.ceph.com/issues/66886 Signed-off-by: Ilya Dryomov (cherry picked from commit f8e5aecfc75bf7d32523e7a8d2d6034b434d216a) --- qa/workunits/rbd/krbd_data_pool.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qa/workunits/rbd/krbd_data_pool.sh b/qa/workunits/rbd/krbd_data_pool.sh index 8eada88bb7045..94520f17308f3 100755 --- a/qa/workunits/rbd/krbd_data_pool.sh +++ b/qa/workunits/rbd/krbd_data_pool.sh @@ -146,14 +146,14 @@ for pool in rbd rbdnonzero; do done done -# rbd_directory, rbd_children, rbd_info + img0 header + ... -NUM_META_RBDS=$((3 + 1 + 3 * (1*2 + 3*2))) -# rbd_directory, rbd_children, rbd_info + ... -NUM_META_CLONESONLY=$((3 + 2 * 3 * (3*2))) +# rbd_directory, rbd_children, rbd_info + rbd_trash + img0 header + ... +NUM_META_RBDS=$((4 + 1 + 3 * (1*2 + 3*2))) +# rbd_directory, rbd_children, rbd_info + rbd_trash + ... +NUM_META_CLONESONLY=$((4 + 2 * 3 * (3*2))) [[ $(rados -p rbd ls | wc -l) -eq $((NUM_META_RBDS + 5 * NUM_OBJECTS)) ]] -[[ $(rados -p repdata ls | wc -l) -eq $((1 + 14 * NUM_OBJECTS)) ]] -[[ $(rados -p ecdata ls | wc -l) -eq $((1 + 14 * NUM_OBJECTS)) ]] +[[ $(rados -p repdata ls | wc -l) -eq $((2 + 14 * NUM_OBJECTS)) ]] +[[ $(rados -p ecdata ls | wc -l) -eq $((2 + 14 * NUM_OBJECTS)) ]] [[ $(rados -p rbdnonzero ls | wc -l) -eq $((NUM_META_RBDS + 5 * NUM_OBJECTS)) ]] [[ $(rados -p clonesonly ls | wc -l) -eq $((NUM_META_CLONESONLY + 6 * NUM_OBJECTS)) ]] @@ -192,8 +192,8 @@ done # mkfs_and_mount should discard some objects everywhere but in clonesonly [[ $(list_HEADs rbd | wc -l) -lt $((NUM_META_RBDS + 5 * NUM_OBJECTS)) ]] -[[ $(list_HEADs repdata | wc -l) -lt $((1 + 14 * NUM_OBJECTS)) ]] -[[ $(list_HEADs ecdata | wc -l) -lt $((1 + 14 * NUM_OBJECTS)) ]] +[[ $(list_HEADs repdata | wc -l) -lt $((2 + 14 * NUM_OBJECTS)) ]] +[[ $(list_HEADs ecdata | wc -l) -lt $((2 + 14 * NUM_OBJECTS)) ]] [[ $(list_HEADs rbdnonzero | wc -l) -lt $((NUM_META_RBDS + 5 * NUM_OBJECTS)) ]] [[ $(list_HEADs clonesonly | wc -l) -eq $((NUM_META_CLONESONLY + 6 * NUM_OBJECTS)) ]] -- 2.39.5