Commit b77f2a6b authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

iscsi: replace trace log with error log for error cases 



Change-Id: I938a90b6f16ba427549875cdf2bf883b38280777
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 3d1b6055

lib/iscsi/init_grp.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp) 
			break;

	}

	if (i == 0) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "num_initiator_names = 0\n");

		SPDK_ERRLOG("num_initiator_names = 0\n");

		goto cleanup;

	}

	num_initiator_names = i;
@@ -94,7 +94,7 @@ spdk_iscsi_init_grp_create_from_configfile(struct spdk_conf_section *sp) 
			break;

	}

	if (i == 0) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "num_initiator_mask = 0\n");

		SPDK_ERRLOG("num_initiator_mask = 0\n");

		goto cleanup;

	}

	num_initiator_masks = i;

lib/iscsi/iscsi_rpc.c

+13 −13
Original line number Diff line number Diff line
@@ -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,

				    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;

	}
@@ -209,7 +209,7 @@ spdk_rpc_add_initiator_group(struct spdk_jsonrpc_server_conn *conn, 
			initiators,

			req.netmask_list.num_netmasks,

			netmasks)) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "create_from_initiator_list failed\n");

		SPDK_ERRLOG("create_from_initiator_list failed\n");

		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,

				    sizeof(rpc_delete_initiator_group_decoders) / sizeof(*rpc_delete_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;

	}
@@ -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,

				    sizeof(rpc_target_node_decoders) / sizeof(*rpc_target_node_decoders),

				    &req)) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		goto invalid;

	}



	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;

	}



	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;

	}
@@ -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,

				    sizeof(rpc_delete_target_node_decoders) / sizeof(*rpc_delete_target_node_decoders),

				    &req)) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		goto invalid;

	}



	if (req.name == NULL) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "missing name param\n");

		SPDK_ERRLOG("missing name param\n");

		goto invalid;

	}



	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;

	}
@@ -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,

				    sizeof(rpc_portal_group_decoders) / sizeof(*rpc_portal_group_decoders),

				    &req)) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		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,

				 req.portal_list.portals[i].port, 0);

		if (portal_list[i] == NULL) {

			SPDK_TRACELOG(SPDK_TRACE_DEBUG, "portal_list allocation failed\n");

			SPDK_ERRLOG("portal_list allocation failed\n");

			goto invalid;

		}

	}



	if (spdk_iscsi_portal_grp_create_from_portal_list(req.tag, portal_list,

			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;

	}
@@ -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,

				    sizeof(rpc_delete_portal_group_decoders) / sizeof(*rpc_delete_portal_group_decoders),

				    &req)) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "spdk_json_decode_object failed\n");

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		goto invalid;

	}

lib/iscsi/param.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	param = spdk_iscsi_param_find(params, key);

	if (param == NULL) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "no key %s\n", key);

		SPDK_ERRLOG("no key %s\n", key);

		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);

	param = spdk_iscsi_param_find(params, key);

	if (param == NULL) {

		SPDK_TRACELOG(SPDK_TRACE_DEBUG, "no key %s\n", key);

		SPDK_ERRLOG("no key %s\n", key);

		return -1;

	}