Make cache invalidation a soft error

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 12da0e60579c025ce751b242e54238c522c65234..1c529792afc952defb9f1422b8d1a953846b3f95 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -194,7 +194,7 @@ err:
 
 static int pre_read_file(struct thread_data *td, struct fio_file *f)
 {
-       int r, did_open = 0, old_runstate;
+       int ret = 0, r, did_open = 0, old_runstate;
        unsigned long long left;
        unsigned int bs;
        char *b;
@@ -216,7 +216,13 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
        b = malloc(bs);
        memset(b, 0, bs);
 
-       lseek(f->fd, f->file_offset, SEEK_SET);
+       if (lseek(f->fd, f->file_offset, SEEK_SET) < 0) {
+               td_verror(td, errno, "lseek");
+               log_err("fio: failed to lseek pre-read file\n");
+               ret = 1;
+               goto error;
+       }
+
        left = f->io_size;
 
        while (left && !td->terminate) {
@@ -234,12 +240,14 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
+error:
        td_restore_runstate(td, old_runstate);
 
        if (did_open)
                td->io_ops->close_file(td, f);
+
        free(b);
-       return 0;
+       return ret;
 }
 
 static unsigned long long get_rand_file_size(struct thread_data *td)
@@ -387,9 +395,6 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
        dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
                                                                len);
 
-       /*
-        * FIXME: add blockdev flushing too
-        */
        if (f->mmap_ptr) {
                ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED);
 #ifdef FIO_MADV_FREE
@@ -411,15 +416,18 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
        } else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE)
                ret = 0;
 
-       if (ret < 0) {
-               td_verror(td, errno, "invalidate_cache");
-               return 1;
-       } else if (ret > 0) {
-               td_verror(td, ret, "invalidate_cache");
-               return 1;
+       /*
+        * Cache flushing isn't a fatal condition, and we know it will
+        * happen on some platforms where we don't have the proper
+        * function to flush eg block device caches. So just warn and
+        * continue on our way.
+        */
+       if (ret) {
+               log_info("fio: cache invalidation of %s failed: %s\n", f->file_name, strerror(errno));
+               ret = 0;
        }
 
-       return ret;
+       return 0;
 
 }
 
@@ -798,7 +806,7 @@ int setup_files(struct thread_data *td)
         * Calculate per-file size and potential extra size for the
         * first files, if needed.
         */
-       if (!o->file_size_low) {
+       if (!o->file_size_low && o->nr_files) {
                uint64_t all_fs;
 
                fs = o->size / o->nr_files;
@@ -1271,13 +1279,6 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
 
        set_already_allocated(file_name);
 
-       /*
-        * For adding files after the fact - if openfiles= isn't
-        * given as an option, ensure we allow at least one file open
-        */
-       if (!td->o.open_files)
-               td->o.open_files = 1;
-
        if (inc)
                td->o.nr_files++;