diff --git a/CHANGELOG.md b/CHANGELOG.md index ee58a0c02..b5358af47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ Added an accelerated table pointer in spdk_nvme_poll_group which can be used provide the accelerated functions by users with hardware engine, such as crc32c accelerated function. +### raid + +For `bdev_raid_create` RPC, the deprecated parameter `strip_size` was removed. + ### bdev For `bdev_ocssd_create` RPC, the optional parameter `range` was removed. diff --git a/module/bdev/raid/bdev_raid.c b/module/bdev/raid/bdev_raid.c index aa667800d..9c668784b 100644 --- a/module/bdev/raid/bdev_raid.c +++ b/module/bdev/raid/bdev_raid.c @@ -622,7 +622,6 @@ raid_bdev_dump_info_json(void *ctx, struct spdk_json_write_ctx *w) /* Dump the raid bdev configuration related information */ spdk_json_write_named_object_begin(w, "raid"); - spdk_json_write_named_uint32(w, "strip_size", raid_bdev->strip_size); spdk_json_write_named_uint32(w, "strip_size_kb", raid_bdev->strip_size_kb); spdk_json_write_named_uint32(w, "state", raid_bdev->state); spdk_json_write_named_string(w, "raid_level", raid_bdev_level_to_str(raid_bdev->level)); diff --git a/module/bdev/raid/bdev_raid.h b/module/bdev/raid/bdev_raid.h index 4acca1da6..609820ed5 100644 --- a/module/bdev/raid/bdev_raid.h +++ b/module/bdev/raid/bdev_raid.h @@ -192,7 +192,7 @@ struct raid_bdev_config { char *name; - /* strip size of this raid bdev in kilo bytes */ + /* strip size of this raid bdev in KB */ uint32_t strip_size; /* number of base bdevs */ diff --git a/module/bdev/raid/bdev_raid_rpc.c b/module/bdev/raid/bdev_raid_rpc.c index 3f3459237..d92f84eed 100644 --- a/module/bdev/raid/bdev_raid_rpc.c +++ b/module/bdev/raid/bdev_raid_rpc.c @@ -158,8 +158,7 @@ struct rpc_bdev_raid_create { /* Raid bdev name */ char *name; - /* RAID strip size KB, 'strip_size' is deprecated. */ - uint32_t strip_size; + /* RAID strip size in KB */ uint32_t strip_size_kb; /* RAID raid level */ @@ -226,10 +225,8 @@ decode_base_bdevs(const struct spdk_json_val *val, void *out) /* * Decoder object for RPC bdev_raid_create */ -/* Note: strip_size is deprecated, one of the two options must be specified but not both. */ static const struct spdk_json_object_decoder rpc_bdev_raid_create_decoders[] = { {"name", offsetof(struct rpc_bdev_raid_create, name), spdk_json_decode_string}, - {"strip_size", offsetof(struct rpc_bdev_raid_create, strip_size), spdk_json_decode_uint32, true}, {"strip_size_kb", offsetof(struct rpc_bdev_raid_create, strip_size_kb), spdk_json_decode_uint32, true}, {"raid_level", offsetof(struct rpc_bdev_raid_create, level), decode_raid_level}, {"base_bdevs", offsetof(struct rpc_bdev_raid_create, base_bdevs), decode_base_bdevs}, @@ -262,16 +259,9 @@ rpc_bdev_raid_create(struct spdk_jsonrpc_request *request, goto cleanup; } - if (req.strip_size == 0 && req.strip_size_kb == 0) { + if (req.strip_size_kb == 0) { spdk_jsonrpc_send_error_response(request, EINVAL, "strip size not specified"); goto cleanup; - } else if (req.strip_size > 0 && req.strip_size_kb > 0) { - spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, - "please use only one strip size option"); - goto cleanup; - } else if (req.strip_size > 0 && req.strip_size_kb == 0) { - SPDK_ERRLOG("the rpc param strip_size is deprecated.\n"); - req.strip_size_kb = req.strip_size; } rc = raid_bdev_config_add(req.name, req.strip_size_kb, req.base_bdevs.num_base_bdevs, diff --git a/scripts/rpc.py b/scripts/rpc.py index 74ca255c7..89d9b3a1c 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1663,14 +1663,12 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse rpc.bdev.bdev_raid_create(args.client, name=args.name, - strip_size=args.strip_size, strip_size_kb=args.strip_size_kb, raid_level=args.raid_level, base_bdevs=base_bdevs) p = subparsers.add_parser('bdev_raid_create', aliases=['construct_raid_bdev'], help='Create new raid bdev') p.add_argument('-n', '--name', help='raid bdev name', required=True) - p.add_argument('-s', '--strip-size', help='strip size in KB (deprecated)', type=int) p.add_argument('-z', '--strip-size_kb', help='strip size in KB', type=int) p.add_argument('-r', '--raid-level', help='raid level, only raid level 0 is supported', required=True) p.add_argument('-b', '--base-bdevs', help='base bdevs name, whitespace separated list in quotes', required=True)