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

event: add "A" to SPDK_APP_GETOPT_STRING

Browse Source 
-A is equivalent to --pci-allowed, which recently
replaced -W/--pci-whitelist.  But we missed adding
"A" to SPDK_APP_GETOPT_STRING, so -A was not actually
working.

Note that bdevperf was using -A to specify that timed
out I/O should be aborted. This patch changes it to
-X to avoid a conflict. It appears that something
broke with this option earlier this year though,
setting it has no actual effect. This should be
investigated separately from this patch.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I2f1aaf0af4e82ba3d08e91e6f9046d485cf04549

Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5645
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Jim Harris 2020-12-18 06:05:37 -07:00 committed by Tomasz Zawadzki
parent 62f81a9e7d
commit 959cfa0fd5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdk/event.h
View File

@ -249,7 +249,7 @@ int spdk_app_parse_core_mask(const char *mask, struct spdk_cpuset *cpumask);
*/ */
const struct spdk_cpuset *spdk_app_get_core_mask(void); const struct spdk_cpuset *spdk_app_get_core_mask(void);
#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvB:L:RW:" #define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvA:B:L:RW:"
enum spdk_app_parse_args_rvals { enum spdk_app_parse_args_rvals {
SPDK_APP_PARSE_ARGS_HELP = 0, SPDK_APP_PARSE_ARGS_HELP = 0,

6
test/bdev/bdevperf/bdevperf.c
View File

@ -1930,7 +1930,7 @@ bdevperf_parse_arg(int ch, char *arg)
g_wait_for_tests = true; g_wait_for_tests = true;
} else if (ch == 'Z') { } else if (ch == 'Z') {
g_zcopy = true; g_zcopy = true;
} else if (ch == 'A') { } else if (ch == 'X') {
g_abort = true; g_abort = true;
} else if (ch == 'C') { } else if (ch == 'C') {
g_multithread_mode = true; g_multithread_mode = true;
@ -1997,7 +1997,7 @@ bdevperf_usage(void)
printf(" -f continue processing I/O even after failures\n"); printf(" -f continue processing I/O even after failures\n");
printf(" -Z enable using zcopy bdev API for read or write I/O\n"); printf(" -Z enable using zcopy bdev API for read or write I/O\n");
printf(" -z start bdevperf, but wait for RPC to start tests\n"); printf(" -z start bdevperf, but wait for RPC to start tests\n");
printf(" -A abort the timeout I/O\n"); printf(" -X abort timed out I/O\n");
printf(" -C enable every core to send I/Os to each bdev\n"); printf(" -C enable every core to send I/Os to each bdev\n");
printf(" -j use job config file\n"); printf(" -j use job config file\n");
} }
@ -2105,7 +2105,7 @@ main(int argc, char **argv)
opts.rpc_addr = NULL; opts.rpc_addr = NULL;
opts.shutdown_cb = spdk_bdevperf_shutdown_cb; opts.shutdown_cb = spdk_bdevperf_shutdown_cb;
if ((rc = spdk_app_parse_args(argc, argv, &opts, "Zzfq:o:t:w:k:ACM:P:S:T:j:", NULL, if ((rc = spdk_app_parse_args(argc, argv, &opts, "Zzfq:o:t:w:k:CM:P:S:T:Xj:", NULL,
bdevperf_parse_arg, bdevperf_usage)) != bdevperf_parse_arg, bdevperf_usage)) !=
SPDK_APP_PARSE_ARGS_SUCCESS) { SPDK_APP_PARSE_ARGS_SUCCESS) {
return rc; return rc;