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

iscsi-test-cu: Improve persistent reservation clearing

Browse Source 
Clear persistent reservations before sending the first SCSI command to the
target to avoid that that command fails due to persistent reservations left
behind by a previous run of the test tool.

Avoid that a subsequent test fails if a test did not remove the persistent
reservations it obtained.

Make sure that clear_pr() returns -1 if clearing persistent reservations
fails.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2019-01-13 11:50:46 -08:00
parent 1bd1232a2a
commit 16435a917d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test-tool/iscsi-test-cu.c
View File

@@ -787,8 +787,12 @@ static int clear_pr(struct scsi_device *sdev)
res = 0; res = 0;
for (i = 0; i < rk->num_keys; i++) { for (i = 0; i < rk->num_keys; i++) {
prout_register_and_ignore(sdev, rk->keys[i]); res = prout_register_and_ignore(sdev, rk->keys[i]);
prout_register_key(sdev, 0, rk->keys[i]); if (res)
break;
res = prout_register_key(sdev, 0, rk->keys[i]);
if (res)
break;
} }
scsi_free_scsi_task(pr_task); scsi_free_scsi_task(pr_task);
@@ -857,6 +861,7 @@ suite_cleanup(void)
for (i = 0; i < mp_num_sds; i++) { for (i = 0; i < mp_num_sds; i++) {
if (mp_sds[i]->iscsi_url) { if (mp_sds[i]->iscsi_url) {
if (mp_sds[i]->iscsi_ctx) { if (mp_sds[i]->iscsi_ctx) {
clear_pr(mp_sds[i]);
iscsi_logout_sync(mp_sds[i]->iscsi_ctx); iscsi_logout_sync(mp_sds[i]->iscsi_ctx);
iscsi_destroy_context(mp_sds[i]->iscsi_ctx); iscsi_destroy_context(mp_sds[i]->iscsi_ctx);
mp_sds[i]->iscsi_ctx = NULL; mp_sds[i]->iscsi_ctx = NULL;
@@ -1241,6 +1246,10 @@ main(int argc, char *argv[])
"Failed to connect to SCSI device %d\n", i); "Failed to connect to SCSI device %d\n", i);
goto err_sds_free; goto err_sds_free;
} }
if (clear_pr(mp_sds[i]) < 0) {
printf("One or more persistent reservations keys have been registered\n");
return -1;
}
} }
if (mp_num_sds > 1) { if (mp_num_sds > 1) {
@@ -1439,11 +1448,6 @@ main(int argc, char *argv[])
} }
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
if (clear_pr(sd) < 0) {
printf("One or more persistent reservations keys have been registered\n");
return -1;
}
/* BLKSECTGET for /dev/sg* is a shitshow under linux. /* BLKSECTGET for /dev/sg* is a shitshow under linux.
* Even 4.2 kernels return number of bytes instead of number * Even 4.2 kernels return number of bytes instead of number
* of sectors here. Just force it to 120k and let us get on with * of sectors here. Just force it to 120k and let us get on with