From: Sitsofe Wheeler <sitsofe@yahoo.com>
Date: Fri, 17 Feb 2017 07:34:05 +0000 (+0000)
Subject: verify: make overwriting verified blocks warning more specific
X-Git-Tag: fio-3.1~29^2~1
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=9f6d708041c703b6a4168176653faf1869a22d46;hp=a94a977497636bdcbef7106ce3617c96c8ad66bd

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 <sitsofe@yahoo.com>
---

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;
 		}