Recent changes (master)
The following changes since commit 0f754a3af30fe6f308ce1c0f95bf1a6f99b3177a:
t/zbd: add test case to confirm no max_open_zones limit check (2025-01-22 11:08:37 -0500)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 46559adef82f7d0a0712ac31b20d98fa6b0bd7af:
t/run-fio-tests: add client/server test script (2025-01-23 12:57:42 -0500)
----------------------------------------------------------------
Vincent Fu (7):
client: rename job_opt_object to global_opt_object
json: allow empty string values
client: separate global options from multiple servers t/fiotestlib: improve JSON decoding
ci: install kill binary for Debian platforms t/client-server: basic client/server test script t/run-fio-tests: add client/server test script
ci/actions-install.sh | 1 + client.c | 42 ++- client.h | 1 + json.c | 3 - t/client_server.py | 505 ++++++++++++++++++++++++++++++++++++ t/client_server/test01.fio | 14 + t/client_server/test04-noglobal.fio | 20 ++ t/client_server/test07-slat.fio | 7 + t/client_server/test08-clat.fio | 7 + t/client_server/test09-lat.fio | 7 + t/client_server/test10-noclat.fio | 7 + t/client_server/test11-alllat.fio | 9 + t/fiotestlib.py | 17 +- t/run-fio-tests.py | 8 + 14 files changed, 628 insertions(+), 20 deletions(-) create mode 100755 t/client_server.py create mode 100644 t/client_server/test01.fio create mode 100644 t/client_server/test04-noglobal.fio create mode 100644 t/client_server/test07-slat.fio create mode 100644 t/client_server/test08-clat.fio create mode 100644 t/client_server/test09-lat.fio create mode 100644 t/client_server/test10-noclat.fio create mode 100644 t/client_server/test11-alllat.fio
---
Diff of recent changes:
ci/actions-install.sh +1 -0
@@ -89,6 +89,7 @@ DPKGCFG bison build-essential flex + procps zlib1g-dev ) fi
client.c +35 -7
80 lines not on this page · raw message
client.h +1 -0
@@ -42,6 +42,7 @@ struct fio_client {char *name;struct flist_head *opt_lists; +struct json_object *global_opts;int state;
json.c +0 -3
@@ -56,9 +56,6 @@ static char *strdup_escape(const char *str)char *p, *ret;int escapes; -if (!strlen (str)) -return NULL ; - escapes =0 ;while ((input =strpbrk (input,"\\\"" )) !=NULL ) { escapes++;
t/client_server.py new file +505 -0
505 lines not on this page · raw message
t/client_server/test01.fio new file +14 -0
@@ -0,0 +1,14 @@ +[global] +ioengine=null +time_based +runtime=3s +filesize=1T + +[test1] +description=test1 + +[test2] +description=test2 + +[test3] +description=test3
t/client_server/test04-noglobal.fio new file +20 -0
@@ -0,0 +1,20 @@ +[test1] +description=test1 +ioengine=null +time_based +runtime=3s +filesize=1T + +[test2] +description=test2 +ioengine=null +time_based +runtime=3s +filesize=1T + +[test3] +description=test3 +ioengine=null +time_based +runtime=3s +filesize=1T
t/client_server/test07-slat.fio new file +7 -0
@@ -0,0 +1,7 @@ +[test] +ioengine=null +iodepth=2 +filesize=1T +time_based +runtime=3s +slat_percentiles=1
t/client_server/test08-clat.fio new file +7 -0
@@ -0,0 +1,7 @@ +[test] +ioengine=null +iodepth=2 +filesize=1T +time_based +runtime=3s +clat_percentiles=1
t/client_server/test09-lat.fio new file +7 -0
@@ -0,0 +1,7 @@ +[test] +ioengine=null +iodepth=2 +filesize=1T +time_based +runtime=3s +lat_percentiles=1
t/client_server/test10-noclat.fio new file +7 -0
@@ -0,0 +1,7 @@ +[test] +ioengine=null +iodepth=2 +filesize=1T +time_based +runtime=3s +clat_percentiles=0
t/client_server/test11-alllat.fio new file +9 -0
@@ -0,0 +1,9 @@ +[test] +ioengine=null +iodepth=2 +filesize=1T +time_based +runtime=3s +slat_percentiles=1 +clat_percentiles=1 +lat_percentiles=1
t/fiotestlib.py +7 -10
@@ -322,19 +322,16 @@ class FioJobCmdTest(FioExeTest): # # Sometimes fio informational messages are included at the top of the # JSON output, especially under Windows. Try to decode output as JSON - # data, lopping off up to the first four lines + # data, skipping everything until the first { # lines = file_data.splitlines() - for i in range(5): - file_data = '\n'.join(lines[i:]) - try: - self.json_data = json.loads(file_data) - except json.JSONDecodeError: - continue - else: - return True + file_data = '\n'.join(lines[lines.index("{"):]) + try: + self.json_data = json.loads(file_data) + except json.JSONDecodeError: + return False - return False + return True @staticmethod def check_empty(job):
t/run-fio-tests.py +8 -0
@@ -1081,6 +1081,14 @@ TEST_LIST = [ 'success': SUCCESS_DEFAULT, 'requirements': [Requirements.linux, Requirements.nvmecdev], }, + { + 'test_id': 1016, + 'test_class': FioExeTest, + 'exe': 't/client_server.py', + 'parameters': ['-f', '{fio_path}'], + 'success': SUCCESS_DEFAULT, + 'requirements': [Requirements.linux], + }, ]