Commit aed8986d authored by Dariusz Stojaczyk's avatar Dariusz Stojaczyk Committed by Jim Harris
Browse files

app: drop -w parameter (wait for rpc init) 



--wait-for-rpc can be used instead.

This parameter will eventually become obsolete,
so let's remove the short version. It will be
exclusively used for "workload" in perf apps.

Change-Id: Ib4b7001d0e756349b05788278c894d622bc89790
Signed-off-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/421863


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 9bd8d2b4

lib/event/app.c

+3 −3
Original line number Diff line number Diff line
@@ -99,8 +99,6 @@ static struct option g_cmdline_options[SPDK_APP_MAX_CMDLINE_OPTIONS + 1] = { 
	{"mem-size",			required_argument,	NULL, MEM_SIZE_OPT_IDX},

#define NO_PCI_OPT_IDX		'u'

	{"no-pci",			no_argument,		NULL, NO_PCI_OPT_IDX},

#define WAIT_FOR_RPC_OPT_IDX	'w'

	{"wait-for-rpc",		no_argument,		NULL, WAIT_FOR_RPC_OPT_IDX},

#define PCI_BLACKLIST_OPT_IDX	'B'

	{"pci-blacklist",		required_argument,	NULL, PCI_BLACKLIST_OPT_IDX},

#define TRACEFLAG_OPT_IDX	'L'
@@ -111,6 +109,8 @@ static struct option g_cmdline_options[SPDK_APP_MAX_CMDLINE_OPTIONS + 1] = { 
	{"pci-whitelist",		required_argument,	NULL, PCI_WHITELIST_OPT_IDX},

#define SILENCE_NOTICELOG_OPT_IDX 257

	{"silence-noticelog",		no_argument,		NULL, SILENCE_NOTICELOG_OPT_IDX},

#define WAIT_FOR_RPC_OPT_IDX	258

	{"wait-for-rpc",		no_argument,		NULL, WAIT_FOR_RPC_OPT_IDX},

	{NULL,				no_argument,		NULL, 0}

};
@@ -888,7 +888,7 @@ spdk_app_parse_args(int argc, char **argv, struct spdk_app_opts *opts, 
	/* TBD: Replace warning by failure when RPCs for startup are prepared. */

	if (opts->config_file && opts->delay_subsystem_init) {

		fprintf(stderr,

			"WARNING: -w and config file are used at the same time. "

			"WARNING: --wait-for-rpc and config file are used at the same time. "

			"- Please be careful one options might overwrite others.\n");

	}

test/iscsi_tgt/calsoft/calsoft.sh

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ echo "IP=$TARGET_IP" >> /usr/local/etc/its.conf 


timing_enter start_iscsi_tgt



$ISCSI_APP -m 0x1 -w &

$ISCSI_APP -m 0x1 --wait-for-rpc &

pid=$!

echo "Process pid: $pid"

test/iscsi_tgt/digests/digests.sh

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ fio_py="python $rootdir/scripts/fio.py" 


timing_enter start_iscsi_tgt



$ISCSI_APP -m $ISCSI_TEST_CORE_MASK -w &

$ISCSI_APP -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &

pid=$!

echo "Process pid: $pid"

test/iscsi_tgt/ext4test/ext4test.sh

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ rpc_py="python $rootdir/scripts/rpc.py" 


timing_enter start_iscsi_tgt



$ISCSI_APP -w &

$ISCSI_APP --wait-for-rpc &

pid=$!

echo "Process pid: $pid"

test/iscsi_tgt/filesystem/filesystem.sh

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ function remove_backends() { 


timing_enter start_iscsi_tgt



$ISCSI_APP -m $ISCSI_TEST_CORE_MASK -w &

$ISCSI_APP -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &

pid=$!

echo "Process pid: $pid"