From 2a2f246615375116a1f58b6adce2b335bade83c6 Mon Sep 17 00:00:00 2001 From: Jon Grimm Date: Fri, 28 Sep 2012 11:27:20 -0500 Subject: [PATCH] test: reserve_basic: mem leak cleanup --- test-tool/0420_reserve6_simple.c | 99 ++++++++++++++++---------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/test-tool/0420_reserve6_simple.c b/test-tool/0420_reserve6_simple.c index 9e0d261..eab91ee 100644 --- a/test-tool/0420_reserve6_simple.c +++ b/test-tool/0420_reserve6_simple.c @@ -53,8 +53,9 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss, iscsi2 = iscsi_context_login(initiator, url, &lun); if (iscsi2 == NULL) { - printf("Failed to login to target\n"); - return -1; + printf("Failed to login to target\n"); + ret = 1; + goto out_login1; } ret = 0; @@ -66,7 +67,7 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss, printf("Failed to send RESERVE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_GOOD) { if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -74,20 +75,20 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss, && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { printf("[OK]\n"); printf("RESERVE6 Not Supported\n"); - ret = 0; + goto finished2; } else { printf("[FAILED]\n"); printf("RESERVE6 failed but ascq was wrong. Should " "have failed with ILLEGAL_REQUEST/" "INVALID OPERATOR. Sense:%s\n", iscsi_get_error(iscsi)); - ret = -1; + ret = -1; + goto finished2; } - scsi_free_scsi_task(task); - goto finished; } - + scsi_free_scsi_task(task); printf("[OK]\n"); + printf("Send RELEASE6...\n"); task = iscsi_release6_sync(iscsi, lun); if (task == NULL) { @@ -95,17 +96,16 @@ int T0420_reserve6_simple(const char *initiator, const char *url, int data_loss, printf("Failed to send RELEASE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("RELEASE6 command failed : %s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } - + scsi_free_scsi_task(task); printf("[OK]\n"); test2: @@ -117,17 +117,16 @@ test2: printf("Failed to send RESERVE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("RESERVE6 command failed : %s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } - + scsi_free_scsi_task(task); printf("[OK]\n"); printf("Send another RESERVE6 from Initiator 1...\n"); @@ -137,18 +136,18 @@ test2: printf("Failed to send RESERVE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("RESERVE6 command failed : %s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } - + scsi_free_scsi_task(task); printf("[OK]\n"); + test3: printf("Send RESERVE6 from Initiator 2...Expect conflict.\n"); task = iscsi_reserve6_sync(iscsi2, lun); @@ -157,17 +156,16 @@ test3: printf("Failed to send RESERVE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; - } + goto finished1; + } /* We expect this command to fail for the test to pass. */ if (task->status != SCSI_STATUS_RESERVATION_CONFLICT) { printf("[FAILED]\n"); printf("Expected RESERVATION CONFLICT\n"); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } - + scsi_free_scsi_task(task); printf("[OK]\n"); test3a: @@ -178,18 +176,19 @@ test3a: printf("Failed to send RELEASE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } /* We expect this command to pass. */ if (task->status != SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("RELEASE6 command: failed with sense %s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); ret = -1; + /* Treat as non-fatal failure for now. STGT is broken.*/ + scsi_free_scsi_task(task); goto test4; } - + scsi_free_scsi_task(task); printf("[OK]\n"); test4: @@ -200,20 +199,19 @@ test4: printf("Failed to send TEST UNIT READY command: %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("TEST UNIT READY command: failed with sense %s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } + scsi_free_scsi_task(task); printf("[OK]\n"); test5: - printf("Send TESTUNITREADY from Initiator 2...Expect conflict.\n"); task = iscsi_testunitready_sync(iscsi2, lun); if (task == NULL) { @@ -221,15 +219,15 @@ test5: printf("Failed to send TEST UNIT READY command: %s\n", iscsi_get_error(iscsi2)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_RESERVATION_CONFLICT) { printf("[FAILED]\n"); printf("Expected RESERVATION CONFLICT\n"); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } + scsi_free_scsi_task(task); printf("[OK]\n"); test6: @@ -241,17 +239,16 @@ test6: printf("Failed to send RELEASE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("RELEASE6 command failed : %s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } - + scsi_free_scsi_task(task); printf("[OK]\n"); printf("Send RESERVE6 Initiator 2...\n"); @@ -261,16 +258,16 @@ test6: printf("Failed to send RESERVE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("RESERVE6 command failed : %s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } + scsi_free_scsi_task(task); printf("[OK]\n"); printf("Send RELEASE6 Initiator 2...\n"); @@ -280,22 +277,26 @@ test6: printf("Failed to send RELEASE6 command : %s\n", iscsi_get_error(iscsi)); ret = -1; - goto finished; + goto finished1; } if (task->status != SCSI_STATUS_GOOD) { printf("[FAILED]\n"); printf("RELEASE6 command failed : %s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); ret = -1; - goto finished; + goto finished2; } - - printf("[OK]\n"); - scsi_free_scsi_task(task); + printf("[OK]\n"); + goto finished1; -finished: + +finished2: + scsi_free_scsi_task(task); +finished1: + iscsi_logout_sync(iscsi2); + iscsi_destroy_context(iscsi2); +out_login1: iscsi_logout_sync(iscsi); iscsi_destroy_context(iscsi); return ret;