From: Radha Ramachandran <radha@google.com>
Date: Thu, 2 Jul 2009 06:30:49 +0000 (+0200)
Subject: Fix issue with fill_device=1 and continue_on_error
X-Git-Tag: fio-1.29~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8a4f8a24a23a1f95ce28338d697c9b552e7e06b4;p=fio.git

Fix issue with fill_device=1 and continue_on_error

I added a change so when both the continue_on_error and fill_device
option is on, when it hits ENOSPC issue the code ignores the error.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/fio.c b/fio.c
index 63d9a1b7..f6ed89f2 100644
--- a/fio.c
+++ b/fio.c
@@ -388,21 +388,29 @@ static int break_on_this_error(struct thread_data *td, int *retptr)
 		else
 			err = td->error;
 
-		update_error_count(td, err);
-
 		if (td_non_fatal_error(err)) {
 		        /*
 		         * Continue with the I/Os in case of
 			 * a non fatal error.
 			 */
+			update_error_count(td, err);
 			td_clear_error(td);
 			*retptr = 0;
 			return 0;
+		} else if (td->o.fill_device && err == ENOSPC) {
+			/*
+			 * We expect to hit this error if
+			 * fill_device option is set.
+			 */
+			td_clear_error(td);
+			td->terminate = 1;
+			return 1;
 		} else {
 			/*
 			 * Stop the I/O in case of a fatal
 			 * error.
 			 */
+			update_error_count(td, err);
 			return 1;
 		}
 	}