From 23eaf7c498fb0f5f315026b9f88d6832cea935e5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 11 Jul 2019 17:04:32 -0500 Subject: [PATCH] qa/standalone/scrub/osd-scrub-snaps: fix kv grep SnapMapper keys are now SNA_, not MAP_. Fixes: http://tracker.ceph.com/issues/40725 Signed-off-by: Sage Weil --- qa/standalone/scrub/osd-scrub-snaps.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh index 5f3bb654963..9be57e44fac 100755 --- a/qa/standalone/scrub/osd-scrub-snaps.sh +++ b/qa/standalone/scrub/osd-scrub-snaps.sh @@ -101,11 +101,11 @@ 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.*MAP_.*[.]1[.]obj5[.][.]$" $dir/drk.log || return 1 + grep "^M.*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.*MAP_.*[.]1[.]obj5[.][.]$" $dir/drk.log || return 1 + grep "^M.*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 +121,12 @@ function create_scenario() { # Starts with a snapmap ceph-kvstore-tool bluestore-kv $dir/${osd} list 2> /dev/null > $dir/drk.log - grep "^M.*MAP_.*[.]7[.]obj16[.][.]$" $dir/drk.log || return 1 + grep "^M.*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.*MAP_.*[.]7[.]obj16[.][.]$" $dir/drk.log || return 1 + ! grep "^M.*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.39.5