TEST_backfill_grow fails after finding "num_bytes mismatch" in osd log

Need to ignore "num_bytes mismatch" messages during throw backfill/recovery
progress.

Fixes: https://tracker.ceph.com/issues/68585
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
(cherry picked from commit 0f0089472cc60fbe24f5cd2562bd119215734f5f)

diff --git a/qa/standalone/osd-backfill/osd-backfill-space.sh b/qa/standalone/osd-backfill/osd-backfill-space.sh
index 6a5c69412f45cece0986b2152d0ad08f87df9a20..84b9703bbfc8144eef0cc6535cd6d07f7e09cb8f 100755 (executable)
--- a/qa/standalone/osd-backfill/osd-backfill-space.sh
+++ b/qa/standalone/osd-backfill/osd-backfill-space.sh
@@ -609,9 +609,16 @@ function TEST_backfill_grow() {
 
     wait_for_clean || return 1
 
+    #Capture the timestamp after complete cleanup or finish the recovery progress
+    current_timestamp=$(date +"%Y-%m-%dT%H:%M:%S")
+
     delete_pool $poolname
     kill_daemons $dir || return 1
-    ! grep -q "num_bytes mismatch" $dir/osd.*.log || return 1
+
+    #Ignore the num_bytes mismatch messages before calling wait_cleanup
+    if ! awk -v ts="$current_timestamp" '$0 >= ts && /num_bytes mismatch/' $dir/osd.*.log > /dev/null; then
+       return 1
+    fi
 }
 
 # Create a 5 shard EC pool on 6 OSD cluster