From cdf54d85054858d9e3fc4d7ee8ea5c6a418f1b43 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 4 Oct 2011 08:31:40 +0200 Subject: [PATCH] client: handle connection failure Signed-off-by: Jens Axboe --- client.c | 1 + init.c | 30 +++++++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/client.c b/client.c index 4d44b103..89c2b442 100644 --- a/client.c +++ b/client.c @@ -111,6 +111,7 @@ static int fio_client_connect(struct fio_client *client) if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) { log_err("fio: connect: %s\n", strerror(errno)); + log_err("fio: failed to connect to %s\n", client->hostname); return 1; } diff --git a/init.c b/init.c index dbad24d4..d9c78ec5 100644 --- a/init.c +++ b/init.c @@ -1359,7 +1359,7 @@ static int parse_cmd_line(int argc, char *argv[]) if (nr_clients && fio_clients_connect()) { do_exit++; exit_val = 1; - return 1; + return -1; } if (is_backend) @@ -1397,17 +1397,19 @@ int parse_options(int argc, char *argv[]) job_files = parse_cmd_line(argc, argv); - for (i = 0; i < job_files; i++) { - if (fill_def_thread()) - return 1; - if (nr_clients) { - if (fio_clients_send_ini(ini_file[i])) - return 1; - free(ini_file[i]); - } else if (!is_backend) { - if (parse_jobs_ini(ini_file[i], 0, i)) + if (job_files > 0) { + for (i = 0; i < job_files; i++) { + if (fill_def_thread()) return 1; - free(ini_file[i]); + if (nr_clients) { + if (fio_clients_send_ini(ini_file[i])) + return 1; + free(ini_file[i]); + } else if (!is_backend) { + if (parse_jobs_ini(ini_file[i], 0, i)) + return 1; + free(ini_file[i]); + } } } @@ -1422,8 +1424,10 @@ int parse_options(int argc, char *argv[]) if (is_backend || nr_clients) return 0; - log_err("No jobs(s) defined\n\n"); - usage(argv[0]); + if (job_files > 0) { + log_err("No jobs(s) defined\n\n"); + usage(argv[0]); + } return 1; } -- 2.25.1