Merge branch 'dev' of https://github.com/smartxworks/fio
authorJens Axboe <axboe@kernel.dk>
Wed, 31 Jul 2019 16:55:51 +0000 (10:55 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 31 Jul 2019 16:55:51 +0000 (10:55 -0600)
* 'dev' of https://github.com/smartxworks/fio:
  libiscsi: continue working when meets EINTR or EAGAIN

engines/libiscsi.c

index bea94c5a14a8dc2a02fba672de4e3b81b0de932d..58667fb216102f21bf7ee4bfaedbb2a1799c929a 100644 (file)
@@ -351,6 +351,9 @@ static int fio_iscsi_getevents(struct thread_data *td, unsigned int min,
 
                ret = poll(iscsi_info->pfds, iscsi_info->nr_luns, -1);
                if (ret < 0) {
+                       if (errno == EINTR || errno == EAGAIN) {
+                               continue;
+                       }
                        log_err("iscsi: failed to poll events: %s.\n",
                                strerror(errno));
                        break;