ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iscsi: dont create portal group from partially invalid portal list

Browse Source 
Changed spdk_iscsi_portal_grp_create_from_portal_list so that it fails
if any given portal is invalid.

Change-Id: I708621a538a52abfed4dce01668d26602a5ada59
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-03-28 18:21:35 +02:00 committed by Jim Harris
parent cf90e4de16
commit 86840974dc
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/iscsi/iscsi_rpc.c
View File

@ -768,7 +768,7 @@ spdk_rpc_add_portal_group(struct spdk_jsonrpc_server_conn *conn,
} }
out: out:
if (rc > 0) { if (rc == 0) {
if (id != NULL) { if (id != NULL) {
w = spdk_jsonrpc_begin_result(conn, id); w = spdk_jsonrpc_begin_result(conn, id);
spdk_json_write_bool(w, true); spdk_json_write_bool(w, true);
@ -776,10 +776,8 @@ out:
} }
} else { } else {
spdk_jsonrpc_send_error_response(conn, id, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(conn, id, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
}
for (i = 0; i < req.portal_list.num_portals; i++) { for (i = 0; i < req.portal_list.num_portals; i++) {
if (portal_list[i] != NULL) {
spdk_iscsi_portal_destroy(portal_list[i]); spdk_iscsi_portal_destroy(portal_list[i]);
} }
} }

38
lib/iscsi/portal_grp.c
View File

@ -302,12 +302,15 @@ spdk_iscsi_portal_grp_register(struct spdk_iscsi_portal_grp *pg)
pthread_mutex_unlock(&g_spdk_iscsi.mutex); pthread_mutex_unlock(&g_spdk_iscsi.mutex);
} }
/**
* If all portals are valid, this function will take their ownership.
*/
int int
spdk_iscsi_portal_grp_create_from_portal_list(int tag, spdk_iscsi_portal_grp_create_from_portal_list(int tag,
struct spdk_iscsi_portal **portal_list, struct spdk_iscsi_portal **portal_list,
int num_portals) int num_portals)
{ {
int i = 0, count = 0, port, sock; int i = 0, rc = 0, port;
struct spdk_iscsi_portal_grp *pg; struct spdk_iscsi_portal_grp *pg;
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "add portal group (from portal list) %d\n", tag); SPDK_TRACELOG(SPDK_TRACE_DEBUG, "add portal group (from portal list) %d\n", tag);
@ -331,27 +334,36 @@ spdk_iscsi_portal_grp_create_from_portal_list(int tag,
i, p->host, p->port, tag); i, p->host, p->port, tag);
port = (int)strtol(p->port, NULL, 0); port = (int)strtol(p->port, NULL, 0);
sock = spdk_sock_listen(p->host, port); p->sock = spdk_sock_listen(p->host, port);
if (sock < 0) {
if (p->sock < 0) {
/* if listening failed on any port, do not register the portal group
* and close any previously opened. */
SPDK_ERRLOG("listen error %.64s:%d\n", p->host, port); SPDK_ERRLOG("listen error %.64s:%d\n", p->host, port);
count++; rc = -1;
continue;
for (--i; i >= 0; --i) {
spdk_sock_close(portal_list[i]->sock);
portal_list[i]->sock = -1;
}
break;
} }
p->sock = sock;
spdk_iscsi_portal_grp_add_portal(pg, p);
portal_list[i] = NULL;
} }
if (count == num_portals) { if (rc < 0) {
/* if listening is failed on all the ports,
* then do not register the portal group. */
spdk_iscsi_portal_grp_destroy(pg); spdk_iscsi_portal_grp_destroy(pg);
return -1;
} else { } else {
/* Add portals to portal group */
for (i = 0; i < num_portals; i++) {
spdk_iscsi_portal_grp_add_portal(pg, portal_list[i]);
}
/* Add portal group to the end of the pg list */ /* Add portal group to the end of the pg list */
spdk_iscsi_portal_grp_register(pg); spdk_iscsi_portal_grp_register(pg);
return num_portals - count;
} }
return rc;
} }
int int