admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

iscsi-perf: add a max reconnects switch and fix double CTRL-C

Browse Source 
this adds a switch to define max_reconnects instead of just aborting
after a NOP timeout. It is now also possible to force an exit
if CTRL-C is pressed twice.

Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2015-03-31 15:44:46 +02:00
parent 153e6ba07c
commit 2c1b88e9e7
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
utils/iscsi-perf.c
View File

@@ -65,6 +65,7 @@ struct client {
uint64_t last_bytes; uint64_t last_bytes;
int ignore_errors; int ignore_errors;
int max_reconnects;
int busy_cnt; int busy_cnt;
int err_cnt; int err_cnt;
int retry_cnt; int retry_cnt;
@@ -110,7 +111,7 @@ void progress(struct client *client) {
uint64_t mbps = 1000000000UL * (client->bytes - client->last_bytes) / (now - client->last_ns); uint64_t mbps = 1000000000UL * (client->bytes - client->last_bytes) / (now - client->last_ns);
printf ("%02" PRIu64 ":%02" PRIu64 ":%02" PRIu64 " - ", _runtime / 3600, (_runtime % 3600) / 60, _runtime % 60); printf ("%02" PRIu64 ":%02" PRIu64 ":%02" PRIu64 " - ", _runtime / 3600, (_runtime % 3600) / 60, _runtime % 60);
printf ("lba %" PRIu64 ", iops current %" PRIu64 " (%" PRIu64 " MB/s), ", client->pos, iops, mbps >> 20); printf ("lba %" PRIu64 ", iops current %" PRIu64 " (%" PRIu64 " MB/s), ", client->pos, iops, mbps >> 20);
printf ("iops average %" PRIu64 " (%" PRIu64 " MB/s), in_flight %d, busy %d ", aiops, ambps >> 20, client->in_flight, client->busy_cnt); printf ("iops average %" PRIu64 " (%" PRIu64 " MB/s), in_flight %d, busy %d ", aiops, ambps >> 20, client->in_flight, client->busy_cnt);
} }
fflush(stdout); fflush(stdout);
client->last_ns = now; client->last_ns = now;
@@ -215,7 +216,7 @@ void fill_read_queue(struct client *client)
} }
void usage(void) { void usage(void) {
fprintf(stderr,"Usage: iscsi-perf [-i <initiator-name>] [-m <max_requests>] [-b blocks_per_request] [-t timeout] [-r|--random] [-n|--ignore-errors] <LUN>\n"); fprintf(stderr,"Usage: iscsi-perf [-i <initiator-name>] [-m <max_requests>] [-b blocks_per_request] [-t timeout] [-r|--random] [-n|--ignore-errors] [-x <max_reconnects>] <LUN>\n");
exit(1); exit(1);
} }
@@ -228,7 +229,7 @@ void sig_handler (int signum ) {
proc_alarm = 1; proc_alarm = 1;
alarm(NOP_INTERVAL); alarm(NOP_INTERVAL);
} else { } else {
finished = 1; finished++;
} }
} }
@@ -255,12 +256,13 @@ int main(int argc, char *argv[])
int option_index; int option_index;
memset(&client, 0, sizeof(client)); memset(&client, 0, sizeof(client));
client.max_reconnects = -1;
srand(time(NULL)); srand(time(NULL));
printf("iscsi-perf version %s - (c) 2014-2015 by Peter Lieven <pl@ĸamp.de>\n\n", VERSION); printf("iscsi-perf version %s - (c) 2014-2015 by Peter Lieven <pl@ĸamp.de>\n\n", VERSION);
while ((c = getopt_long(argc, argv, "i:m:b:t:nrR", long_options, while ((c = getopt_long(argc, argv, "i:m:b:t:nrRx:", long_options,
&option_index)) != -1) { &option_index)) != -1) {
switch (c) { switch (c) {
case 'i': case 'i':
@@ -284,6 +286,9 @@ int main(int argc, char *argv[])
case 'R': case 'R':
client.random_blocks = 1; client.random_blocks = 1;
break; break;
case 'x':
client.max_reconnects = atoi(optarg);
break;
default: default:
fprintf(stderr, "Unrecognized option '%c'\n\n", c); fprintf(stderr, "Unrecognized option '%c'\n\n", c);
usage(); usage();
@@ -381,20 +386,24 @@ int main(int argc, char *argv[])
client.first_ns = client.last_ns = get_clock_ns(); client.first_ns = client.last_ns = get_clock_ns();
iscsi_set_reconnect_max_retries(client.iscsi, client.max_reconnects);
fill_read_queue(&client); fill_read_queue(&client);
alarm(NOP_INTERVAL); alarm(NOP_INTERVAL);
while (client.in_flight && !client.err_cnt) { while (client.in_flight && !client.err_cnt && finished < 2) {
pfd[0].fd = iscsi_get_fd(client.iscsi); pfd[0].fd = iscsi_get_fd(client.iscsi);
pfd[0].events = iscsi_which_events(client.iscsi); pfd[0].events = iscsi_which_events(client.iscsi);
if (proc_alarm) { if (proc_alarm) {
if (iscsi_get_nops_in_flight(client.iscsi) > MAX_NOP_FAILURES) { if (iscsi_get_nops_in_flight(client.iscsi) > MAX_NOP_FAILURES) {
fprintf(stderr, "\n\nABORT: NOP timeout.\n"); iscsi_reconnect(client.iscsi);
exit(10); } else {
iscsi_nop_out_async(client.iscsi, NULL, NULL, 0, NULL);
}
if (!iscsi_get_nops_in_flight(client.iscsi)) {
finished = 0;
} }
iscsi_nop_out_async(client.iscsi, NULL, NULL, 0, NULL);
proc_alarm = 0; proc_alarm = 0;
} }
@@ -411,7 +420,7 @@ int main(int argc, char *argv[])
progress(&client); progress(&client);
if (!client.err_cnt) { if (!client.err_cnt && finished < 2) {
printf ("\n\nfinished.\n"); printf ("\n\nfinished.\n");
iscsi_logout_sync(client.iscsi); iscsi_logout_sync(client.iscsi);
} else { } else {