Make fill_device to stop writing on EDQUOT
PATCH v2 1/1 Make fill_device to stop writing on EDQUOT
Option fill_device stops writing when we run out of quota as well.
Signed-off-by Martin Bukatovic <[email protected]>
---
Changes in v2:
- moved ENOSPC check into ENOSPC check, modified the log statement
HOWTO | 3 ++- backend.c | 7 ++++--- filesetup.c | 12 +++++++++--- fio.1 | 3 ++- 4 files changed, 17 insertions(+), 8 deletions(-)
HOWTO +2 -1
@@ -1852,7 +1852,8 @@ I/O size .. option:: fill_device=bool, fill_fs=bool Sets size to something really large and waits for ENOSPC (no space left on - device) as the terminating condition. Only makes sense with sequential + device) or EDQUOT (disk quota exceeded) + as the terminating condition. Only makes sense with sequential write. For a read workload, the mount point will be filled first then I/O started on the result. This option doesn't make sense if operating on a raw device node, since the size of that is already known by the file system.
backend.c +4 -3
@@ -393,7 +393,7 @@ static bool break_on_this_error(struct thread_data *td, enum fio_ddir ddir,td_clear_error (td); *retptr =0 ;return false; - }else if (td->o.fill_device && err ==ENOSPC ) { + }else if (td->o.fill_device && (err ==ENOSPC || err ==EDQUOT )) {/* * We expect to hit this error if * fill_device option is set.
@@ -1105,7 +1105,7 @@ reap:if (td->trim_entries)log_err ("fio: %lu trim entries leaked?\n" , td->trim_entries); -if (td->o.fill_device && td->error ==ENOSPC ) { +if (td->o.fill_device && (td->error ==ENOSPC || td->error ==EDQUOT )) { td->error =0 ;fio_mark_td_terminate (td); }
@@ -1120,7 +1120,8 @@ reap:if (i) { ret =io_u_queued_complete (td, i); -if (td->o.fill_device && td->error ==ENOSPC ) +if (td->o.fill_device && + (td->error ==ENOSPC || td->error ==EDQUOT )) td->error =0 ; }
filesetup.c +9 -3
@@ -226,11 +226,17 @@ static int extend_file(struct thread_data *td, struct fio_file *f)if (r <0 ) {int __e = errno; -if (__e ==ENOSPC ) { +if (__e ==ENOSPC || __e ==EDQUOT ) { +const char * __e_name;if (td->o.fill_device)break ; -log_info ("fio: ENOSPC on laying out " -"file, stopping\n" ); +if (__e ==ENOSPC ) { + __e_name ="ENOSPC" ; + }else { + __e_name ="EDQUOT" ; + } +log_info ("fio: %s on laying out " +"file, stopping\n" , __e_name); }td_verror (td, errno,"write" ); }else
fio.1 +2 -1
@@ -1638,7 +1638,8 @@ of a file. This option is ignored on non-regular files. .TP .BI fill_device \fR=\fPbool "\fR,\fB fill_fs" \fR=\fPbool Sets size to something really large and waits for ENOSPC (no space left on -device) as the terminating condition. Only makes sense with sequential +device) or EDQUOT (disk quota exceeded) +as the terminating condition. Only makes sense with sequential write. For a read workload, the mount point will be filled first then I/O started on the result. This option doesn't make sense if operating on a raw device node, since the size of that is already known by the file system.
Signature · 5 lines
2.30.2 -- Martin Bukatovič
filesetup.c static int extend_file(struct thread_data *td, struct fio_file *f) · line 230
Quoted 11 lines · Martin Bukatovic
filesetup.c +2
-1@@ -226,11 +226,17 @@ static int extend_file(struct thread_data *td, struct fio_file *f)if (r <0 ) {int __e = errno; -if (__e ==ENOSPC ) { +if (__e ==ENOSPC || __e ==EDQUOT ) { +const char * __e_name;
'*' goes with the variable name in the fio coding style.
filesetup.c static int extend_file(struct thread_data *td, struct fio_file *f) · line 237
Quoted 9 lines
filesetup.c +5
-2if (td->o.fill_device)break ; -log_info ("fio: ENOSPC on laying out " -"file, stopping\n" ); +if (__e ==ENOSPC ) { + __e_name ="ENOSPC" ; + }else { + __e_name ="EDQUOT" ; + }
And no braces for single lines.
Apart from that, looks fine to me. Can you do a quick v3 with those changes?
Signature · 1 line
Jens Axboe