Merge pull request #16985 from dzafman/wip-standalone-luminous

luminous: tests: qa/standalone: misc fixes

diff --cc qa/standalone/scrub/osd-scrub-snaps.sh
index 590a1a3964a409ccebe3c5faf93f1f6c76e4f703,8fa348ec6b7dbcd10f1512bb3a02fd9f5a7661a3..4c03bdb9efcd1cfd737e20b2ff210f68f87cf000
--- 1/qa/standalone/scrub/osd-scrub-snaps.sh
--- 2/qa/standalone/scrub/osd-scrub-snaps.sh
+++ b/qa/standalone/scrub/osd-scrub-snaps.sh
@@@ -449,15 -450,14 +450,14 @@@ EO
      err_strings[19]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj9:1 is missing in clone_size"
      err_strings[20]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj11:1 is an unexpected clone"
      err_strings[21]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj14:1 size 1032 != clone_size 1033"
-     err_strings[22]="log_channel[(]cluster[)] log [[]ERR[]] : [0-9]*[.]0 scrub 23 errors"
+     err_strings[22]="log_channel[(]cluster[)] log [[]ERR[]] : [0-9]*[.]0 scrub 22 errors"
      err_strings[23]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj15:head can't decode 'snapset' attr buffer"
-     err_strings[24]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj12:1 has no oi or legacy_snaps; cannot convert 1=[[]1[]]:[[]1[]].stray_clone_snaps=[{]1=[[]1[]][}]"
  
 -    for i in `seq 0 ${#err_strings[@]}`
 +    for err_string in "${err_strings[@]}"
      do
 -        if ! grep "${err_strings[$i]}" $dir/osd.0.log > /dev/null;
 +        if ! grep "$err_string" $dir/osd.0.log > /dev/null;
          then
 -            echo "Missing log message '${err_strings[$i]}'"
 +            echo "Missing log message '$err_string'"
              ERRORS=$(expr $ERRORS + 1)
          fi
      done

diff --cc src/osd/PG.cc
Simple merge