Merge branch 'axboe:master' into directory-operation

axboe · Mar 22, 2024 · 68a16c3 · 68a16c3
2 parents 0768b79 + 20f42c1
commit 68a16c3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/iolog.c b/iolog.c
@@ -102,6 +102,8 @@ static void iolog_delay(struct thread_data *td, unsigned long delay)
  ret = io_u_queued_complete(td, 0);
  if (ret < 0)
  td_verror(td, -ret, "io_u_queued_complete");
+ if (td->flags & TD_F_REGROW_LOGS)
+ regrow_logs(td);
  if (utime_since_now(&ts) > delay)
  break;
  }

diff --git a/t/jobs/t0031-pre.fio b/t/jobs/t0031-pre.fio
@@ -0,0 +1,8 @@
+[job]
+rw=write
+ioengine=libaio
+size=1mb
+time_based=1
+runtime=1
+filename=t0030file
+write_iolog=iolog
diff --git a/t/jobs/t0031.fio b/t/jobs/t0031.fio
@@ -0,0 +1,7 @@
+[job]
+rw=read
+ioengine=libaio
+iodepth=128
+filename=t0030file
+read_iolog=iolog
+write_lat_log=lat_log
diff --git a/t/run-fio-tests.py b/t/run-fio-tests.py
@@ -869,6 +869,15 @@ def check_result(self):
  'parameters': ['--bandwidth-log'],
  'requirements': [],
  },
+ {
+ 'test_id': 31,
+ 'test_class': FioJobFileTest,
+ 'job': 't0031.fio',
+ 'success': SUCCESS_DEFAULT,
+ 'pre_job': 't0031-pre.fio',
+ 'pre_success': SUCCESS_DEFAULT,
+ 'requirements': [Requirements.linux, Requirements.libaio],
+ },
  {
  'test_id': 1000,
  'test_class': FioExeTest,