From 9f6d708041c703b6a4168176653faf1869a22d46 Mon Sep 17 00:00:00 2001 From: Sitsofe Wheeler Date: Fri, 17 Feb 2017 07:34:05 +0000 Subject: [PATCH] verify: make overwriting verified blocks warning more specific Try to avoid warning when it looks like the filename used is being auto-generated in a unique fashion and make the start of the warning more consistent with other fio warnings. Signed-off-by: Sitsofe Wheeler --- init.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/init.c b/init.c index 42e71071..5054c54b 100644 --- a/init.c +++ b/init.c @@ -731,9 +731,14 @@ static int fixup_options(struct thread_data *td) o->size = -1ULL; if (o->verify != VERIFY_NONE) { - if (td_write(td) && o->do_verify && o->numjobs > 1) { - log_info("Multiple writers may overwrite blocks that " - "belong to other jobs. This can cause " + if (td_write(td) && o->do_verify && o->numjobs > 1 && + (o->filename || + !(o->unique_filename && + strstr(o->filename_format, "$jobname") && + strstr(o->filename_format, "$jobnum") && + strstr(o->filename_format, "$filenum")))) { + log_info("fio: multiple writers may overwrite blocks " + "that belong to other jobs. This can cause " "verification failures.\n"); ret = warnings_fatal; } -- 2.25.1