Merge pull request ceph#60636 from mohit84/issue_68585

TEST_backfill_grow fails after finding "num_bytes mismatch" in osd log

Reviewed-by: Ronen Friedman <[email protected]>
Reviewed-by: Samuel Just <[email protected]>

Author: yuriw

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