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

iscsi: replace trace log with error log for error cases

Browse Source 
Change-Id: I938a90b6f16ba427549875cdf2bf883b38280777
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Changpeng Liu 2016-11-17 14:33:54 +08:00 committed by Jim Harris
parent 3d1b60557c
commit b77f2a6bc3
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/iscsi/init_grp.c
View File

@ -80,7 +80,7 @@ spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp)
break; break;
} }
if (i == 0) { if (i == 0) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "num_initiator_names = 0\n"); SPDK_ERRLOG("num_initiator_names = 0\n");
goto cleanup; goto cleanup;
} }
num_initiator_names = i; num_initiator_names = i;
@ -94,7 +94,7 @@ spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp)
break; break;
} }
if (i == 0) { if (i == 0) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "num_initiator_mask = 0\n"); SPDK_ERRLOG("num_initiator_mask = 0\n");
goto cleanup; goto cleanup;
} }
num_initiator_masks = i; num_initiator_masks = i;

26
lib/iscsi/iscsi_rpc.c
View File

@ -173,7 +173,7 @@ spdk_rpc_add_initiator_group(struct spdk_jsonrpc_server_conn *conn,
if (spdk_json_decode_object(params, rpc_initiator_group_decoders, if (spdk_json_decode_object(params, rpc_initiator_group_decoders,
sizeof(rpc_initiator_group_decoders) / sizeof(*rpc_initiator_group_decoders), &req)) { sizeof(rpc_initiator_group_decoders) / sizeof(*rpc_initiator_group_decoders), &req)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
} }
@ -209,7 +209,7 @@ spdk_rpc_add_initiator_group(struct spdk_jsonrpc_server_conn *conn,
initiators, initiators,
req.netmask_list.num_netmasks, req.netmask_list.num_netmasks,
netmasks)) { netmasks)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "create_from_initiator_list failed\n"); SPDK_ERRLOG("create_from_initiator_list failed\n");
goto invalid; goto invalid;
} }
@ -262,7 +262,7 @@ spdk_rpc_delete_initiator_group(struct spdk_jsonrpc_server_conn *conn,
if (spdk_json_decode_object(params, rpc_delete_initiator_group_decoders, if (spdk_json_decode_object(params, rpc_delete_initiator_group_decoders,
sizeof(rpc_delete_initiator_group_decoders) / sizeof(*rpc_delete_initiator_group_decoders), sizeof(rpc_delete_initiator_group_decoders) / sizeof(*rpc_delete_initiator_group_decoders),
&req)) { &req)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
} }
@ -503,17 +503,17 @@ spdk_rpc_construct_target_node(struct spdk_jsonrpc_server_conn *conn,
if (spdk_json_decode_object(params, rpc_target_node_decoders, if (spdk_json_decode_object(params, rpc_target_node_decoders,
sizeof(rpc_target_node_decoders) / sizeof(*rpc_target_node_decoders), sizeof(rpc_target_node_decoders) / sizeof(*rpc_target_node_decoders),
&req)) { &req)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
} }
if (req.pg_tags.num_tags != req.ig_tags.num_tags) { if (req.pg_tags.num_tags != req.ig_tags.num_tags) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "pg_tags/ig_tags count mismatch\n"); SPDK_ERRLOG("pg_tags/ig_tags count mismatch\n");
goto invalid; goto invalid;
} }
if (req.lun_names.num_names != req.lun_ids.num_ids) { if (req.lun_names.num_names != req.lun_ids.num_ids) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "lun_names/lun_ids count mismatch\n"); SPDK_ERRLOG("lun_names/lun_ids count mismatch\n");
goto invalid; goto invalid;
} }
@ -583,17 +583,17 @@ spdk_rpc_delete_target_node(struct spdk_jsonrpc_server_conn *conn,
if (spdk_json_decode_object(params, rpc_delete_target_node_decoders, if (spdk_json_decode_object(params, rpc_delete_target_node_decoders,
sizeof(rpc_delete_target_node_decoders) / sizeof(*rpc_delete_target_node_decoders), sizeof(rpc_delete_target_node_decoders) / sizeof(*rpc_delete_target_node_decoders),
&req)) { &req)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
} }
if (req.name == NULL) { if (req.name == NULL) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "missing name param\n"); SPDK_ERRLOG("missing name param\n");
goto invalid; goto invalid;
} }
if (spdk_iscsi_shutdown_tgt_node_by_name(req.name)) { if (spdk_iscsi_shutdown_tgt_node_by_name(req.name)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "shutdown_tgt_node_by_name failed\n"); SPDK_ERRLOG("shutdown_tgt_node_by_name failed\n");
goto invalid; goto invalid;
} }
@ -746,7 +746,7 @@ spdk_rpc_add_portal_group(struct spdk_jsonrpc_server_conn *conn,
if (spdk_json_decode_object(params, rpc_portal_group_decoders, if (spdk_json_decode_object(params, rpc_portal_group_decoders,
sizeof(rpc_portal_group_decoders) / sizeof(*rpc_portal_group_decoders), sizeof(rpc_portal_group_decoders) / sizeof(*rpc_portal_group_decoders),
&req)) { &req)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
} }
@ -754,14 +754,14 @@ spdk_rpc_add_portal_group(struct spdk_jsonrpc_server_conn *conn,
portal_list[i] = spdk_iscsi_portal_create(req.portal_list.portals[i].host, portal_list[i] = spdk_iscsi_portal_create(req.portal_list.portals[i].host,
req.portal_list.portals[i].port, 0); req.portal_list.portals[i].port, 0);
if (portal_list[i] == NULL) { if (portal_list[i] == NULL) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "portal_list allocation failed\n"); SPDK_ERRLOG("portal_list allocation failed\n");
goto invalid; goto invalid;
} }
} }
if (spdk_iscsi_portal_grp_create_from_portal_list(req.tag, portal_list, if (spdk_iscsi_portal_grp_create_from_portal_list(req.tag, portal_list,
req.portal_list.num_portals)) { req.portal_list.num_portals)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "create_from_portal_list failed\n"); SPDK_ERRLOG("create_from_portal_list failed\n");
goto invalid; goto invalid;
} }
@ -808,7 +808,7 @@ spdk_rpc_delete_portal_group(struct spdk_jsonrpc_server_conn *conn,
if (spdk_json_decode_object(params, rpc_delete_portal_group_decoders, if (spdk_json_decode_object(params, rpc_delete_portal_group_decoders,
sizeof(rpc_delete_portal_group_decoders) / sizeof(*rpc_delete_portal_group_decoders), sizeof(rpc_delete_portal_group_decoders) / sizeof(*rpc_delete_portal_group_decoders),
&req)) { &req)) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
} }

4
lib/iscsi/param.c
View File

@ -176,7 +176,7 @@ spdk_iscsi_param_set(struct iscsi_param *params, const char *key,
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "set %s=%s\n", key, val); SPDK_TRACELOG(SPDK_TRACE_DEBUG, "set %s=%s\n", key, val);
param = spdk_iscsi_param_find(params, key); param = spdk_iscsi_param_find(params, key);
if (param == NULL) { if (param == NULL) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "no key %s\n", key); SPDK_ERRLOG("no key %s\n", key);
return -1; return -1;
} }
@ -196,7 +196,7 @@ spdk_iscsi_param_set_int(struct iscsi_param *params, const char *key, uint32_t v
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "set %s=%d\n", key, val); SPDK_TRACELOG(SPDK_TRACE_DEBUG, "set %s=%d\n", key, val);
param = spdk_iscsi_param_find(params, key); param = spdk_iscsi_param_find(params, key);
if (param == NULL) { if (param == NULL) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "no key %s\n", key); SPDK_ERRLOG("no key %s\n", key);
return -1; return -1;
} }