Commit 8a857a3b authored by Changpeng Liu's avatar Changpeng Liu
Browse files

iscsi: Deprecate MinConnectionsPerCore finally 



Parameter 'MinConnectionsPerCore' was removed in last release and marked
as deprecated, now we will deprecate 'MinConnectionsPerCore' finally.

Change-Id: I613a371e8b5352dfb84f8e4293805b792020c643
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468789


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent fbeebab0

lib/iscsi/iscsi.h

+0 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ struct spdk_iscsi_opts { 
	bool ImmediateData;

	uint32_t ErrorRecoveryLevel;

	bool AllowDuplicateIsid;

	uint32_t min_connections_per_core; /* Deprecated */

};



struct spdk_iscsi_globals {

lib/iscsi/iscsi_rpc.c

+0 −1
Original line number Diff line number Diff line
@@ -1520,7 +1520,6 @@ static const struct spdk_json_object_decoder rpc_set_iscsi_opts_decoders[] = { 
	{"immediate_data", offsetof(struct spdk_iscsi_opts, ImmediateData), spdk_json_decode_bool, true},

	{"error_recovery_level", offsetof(struct spdk_iscsi_opts, ErrorRecoveryLevel), spdk_json_decode_uint32, true},

	{"allow_duplicated_isid", offsetof(struct spdk_iscsi_opts, AllowDuplicateIsid), spdk_json_decode_bool, true},

	{"min_connections_per_core", offsetof(struct spdk_iscsi_opts, min_connections_per_core), spdk_json_decode_uint32, true},

};



static void

lib/iscsi/iscsi_subsystem.c

+0 −11
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ iscsi_opts_init(struct spdk_iscsi_opts *opts) 
	opts->chap_group = 0;

	opts->authfile = NULL;

	opts->nodebase = NULL;

	opts->min_connections_per_core = 0;

}



struct spdk_iscsi_opts *
@@ -472,7 +471,6 @@ spdk_iscsi_opts_copy(struct spdk_iscsi_opts *src) 
	dst->require_chap = src->require_chap;

	dst->mutual_chap = src->mutual_chap;

	dst->chap_group = src->chap_group;

	dst->min_connections_per_core = 0;



	return dst;

}
@@ -491,7 +489,6 @@ iscsi_read_config_file_params(struct spdk_conf_section *sp, 
	int ErrorRecoveryLevel;

	int timeout;

	int nopininterval;

	int min_conn_per_core = 0;

	const char *ag_tag;

	int ag_tag_i;

	int i;
@@ -619,10 +616,6 @@ iscsi_read_config_file_params(struct spdk_conf_section *sp, 
			}

		}

	}

	min_conn_per_core = spdk_conf_section_get_intval(sp, "MinConnectionsPerCore");

	if (min_conn_per_core >= 0) {

		SPDK_WARNLOG("MinConnectionsPerCore is deprecated and will be ignored.\n");

	}



	return 0;

}
@@ -776,10 +769,6 @@ iscsi_set_global_params(struct spdk_iscsi_opts *opts) 
	g_spdk_iscsi.mutual_chap = opts->mutual_chap;

	g_spdk_iscsi.chap_group = opts->chap_group;



	if (opts->min_connections_per_core) {

		SPDK_WARNLOG("iSCSI option 'min_connections_per_core' has been deprecated and will be ignored.\n");

	}



	iscsi_log_globals();



	return 0;

test/config_converter/config.ini

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
  MaxR2T 256

  NopInInterval 10

  AllowDuplicateIsid Yes

  MinConnectionsPerCore 4

  DefaultTime2Wait 2

  QueueDepth 128