From af9befb0f4cb19651a7a69f5b5f455be43fe22aa Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 11 Jan 2021 16:00:05 -0800 Subject: [PATCH] test: Fix osd-scrub-scaps.sh to handle DB format change Caused by: f9c95fa7fc7b0ee992c0249ff090fa7f751e9719 Fixes: https://tracker.ceph.com/issues/48789 Signed-off-by: David Zafman --- qa/standalone/scrub/osd-scrub-snaps.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh index 621fe84accad..39e0f40f7405 100755 --- a/qa/standalone/scrub/osd-scrub-snaps.sh +++ b/qa/standalone/scrub/osd-scrub-snaps.sh @@ -101,11 +101,13 @@ function create_scenario() { OBJ5SAVE="$JSON" # Starts with a snapmap ceph-kvstore-tool bluestore-kv $dir/${osd} list 2> /dev/null > $dir/drk.log - grep "^m.*SNA_.*[.]1[.]obj5[.][.]$" $dir/drk.log || return 1 + grep SNA_ $dir/drk.log + grep "^[pm].*SNA_.*[.]1[.]obj5[.][.]$" $dir/drk.log || return 1 ceph-objectstore-tool --data-path $dir/${osd} --rmtype nosnapmap "$JSON" remove || return 1 # Check that snapmap is stil there ceph-kvstore-tool bluestore-kv $dir/${osd} list 2> /dev/null > $dir/drk.log - grep "^m.*SNA_.*[.]1[.]obj5[.][.]$" $dir/drk.log || return 1 + grep SNA_ $dir/drk.log + grep "^[pm].*SNA_.*[.]1[.]obj5[.][.]$" $dir/drk.log || return 1 rm -f $dir/drk.log JSON="$(ceph-objectstore-tool --data-path $dir/${osd} --op list obj5 | grep \"snapid\":4)" @@ -121,12 +123,14 @@ function create_scenario() { # Starts with a snapmap ceph-kvstore-tool bluestore-kv $dir/${osd} list 2> /dev/null > $dir/drk.log - grep "^m.*SNA_.*[.]7[.]obj16[.][.]$" $dir/drk.log || return 1 + grep SNA_ $dir/drk.log + grep "^[pm].*SNA_.*[.]7[.]obj16[.][.]$" $dir/drk.log || return 1 JSON="$(ceph-objectstore-tool --data-path $dir/${osd} --op list obj16 | grep \"snapid\":7)" ceph-objectstore-tool --data-path $dir/${osd} --rmtype snapmap "$JSON" remove || return 1 # Check that snapmap is now removed ceph-kvstore-tool bluestore-kv $dir/${osd} list 2> /dev/null > $dir/drk.log - ! grep "^m.*SNA_.*[.]7[.]obj16[.][.]$" $dir/drk.log || return 1 + grep SNA_ $dir/drk.log + ! grep "^[pm].*SNA_.*[.]7[.]obj16[.][.]$" $dir/drk.log || return 1 rm -f $dir/drk.log JSON="$(ceph-objectstore-tool --data-path $dir/${osd} --head --op list obj2)" -- 2.47.3