bdev/daos: add resize rpc call
Signed-off-by: Denis Barakhtanov <denis.barahtanov@croit.io> Change-Id: I71d643733e31eb2229649cff3db610d5bee07796 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14921 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Community-CI: Mellanox Build Bot
This commit is contained in:
parent
a9be4f2c2f
commit
bdc683aaa9
@ -697,3 +697,9 @@ Example command for creating daos bdev:
|
||||
Example command for removing daos bdev:
|
||||
|
||||
`rpc.py bdev_daos_delete daosdev0`
|
||||
|
||||
To resize a bdev use the bdev_daos_resize command.
|
||||
|
||||
`rpc.py bdev_daos_resize daosdev0 8192`
|
||||
|
||||
This command will resize the daosdev0 bdev to 8192 MiB.
|
||||
|
@ -485,7 +485,8 @@ Example response:
|
||||
"bdev_lvol_rename_lvstore",
|
||||
"bdev_lvol_create_lvstore",
|
||||
"bdev_daos_delete",
|
||||
"bdev_daos_create"
|
||||
"bdev_daos_create",
|
||||
"bdev_daos_resize"
|
||||
]
|
||||
}
|
||||
~~~
|
||||
@ -10783,3 +10784,40 @@ Example response:
|
||||
"result": true
|
||||
}
|
||||
~~~
|
||||
|
||||
### bdev_daos_resize {#rpc_bdev_daos_resize}
|
||||
|
||||
Resize @ref bdev_config_daos.
|
||||
|
||||
#### Parameters
|
||||
|
||||
Name | Optional | Type | Description
|
||||
----------------------- | -------- | ----------- | -----------
|
||||
name | Required | string | Bdev name
|
||||
new_size | Required | number | Bdev new capacity in MB
|
||||
|
||||
#### Example
|
||||
|
||||
Example request:
|
||||
|
||||
~~~json
|
||||
{
|
||||
"params": {
|
||||
"name": "daosdev0",
|
||||
"new_size": 8192
|
||||
},
|
||||
"jsonrpc": "2.0",
|
||||
"method": "bdev_daos_resize",
|
||||
"id": 1
|
||||
}
|
||||
~~~
|
||||
|
||||
Example response:
|
||||
|
||||
~~~json
|
||||
{
|
||||
"jsonrpc": "2.0",
|
||||
"id": 1,
|
||||
"result": true
|
||||
}
|
||||
~~~
|
||||
|
@ -725,6 +725,68 @@ create_bdev_daos(struct spdk_bdev **bdev,
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void
|
||||
dummy_bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev, void *ctx)
|
||||
{
|
||||
}
|
||||
|
||||
int
|
||||
bdev_daos_resize(const char *name, const uint64_t new_size_in_mb)
|
||||
{
|
||||
int rc = 0;
|
||||
struct spdk_bdev_desc *desc;
|
||||
struct spdk_bdev *bdev;
|
||||
struct spdk_io_channel *ch;
|
||||
struct bdev_daos_io_channel *dch;
|
||||
uint64_t new_size_in_byte;
|
||||
uint64_t current_size_in_mb;
|
||||
|
||||
rc = spdk_bdev_open_ext(name, false, dummy_bdev_event_cb, NULL, &desc);
|
||||
if (rc != 0) {
|
||||
return rc;
|
||||
}
|
||||
|
||||
bdev = spdk_bdev_desc_get_bdev(desc);
|
||||
if (bdev->module != &daos_if) {
|
||||
rc = -EINVAL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
current_size_in_mb = bdev->blocklen * bdev->blockcnt / (1024 * 1024);
|
||||
if (current_size_in_mb > new_size_in_mb) {
|
||||
SPDK_ERRLOG("The new bdev size must be larger than current bdev size.\n");
|
||||
rc = -EINVAL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
ch = bdev_daos_get_io_channel(bdev);
|
||||
dch = spdk_io_channel_get_ctx(ch);
|
||||
new_size_in_byte = new_size_in_mb * 1024 * 1024;
|
||||
|
||||
rc = dfs_punch(dch->dfs, dch->obj, new_size_in_byte, DFS_MAX_FSIZE);
|
||||
spdk_put_io_channel(ch);
|
||||
if (rc != 0) {
|
||||
SPDK_ERRLOG("failed to resize daos bdev: " DF_RC "\n", DP_RC(rc));
|
||||
rc = -EINTR;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
SPDK_NOTICELOG("DAOS bdev device is resized: bdev name %s, old block count %" PRIu64
|
||||
", new block count %"
|
||||
PRIu64 "\n",
|
||||
bdev->name,
|
||||
bdev->blockcnt,
|
||||
new_size_in_byte / bdev->blocklen);
|
||||
rc = spdk_bdev_notify_blockcnt_change(bdev, new_size_in_byte / bdev->blocklen);
|
||||
if (rc != 0) {
|
||||
SPDK_ERRLOG("failed to notify block cnt change.\n");
|
||||
}
|
||||
|
||||
exit:
|
||||
spdk_bdev_close(desc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
void
|
||||
delete_bdev_daos(struct spdk_bdev *bdev, spdk_delete_daos_complete cb_fn, void *cb_arg)
|
||||
{
|
||||
|
@ -19,4 +19,12 @@ int create_bdev_daos(struct spdk_bdev **bdev, const char *name, const struct spd
|
||||
|
||||
void delete_bdev_daos(struct spdk_bdev *bdev, spdk_delete_daos_complete cb_fn, void *cb_arg);
|
||||
|
||||
/**
|
||||
* Resize DAOS bdev.
|
||||
*
|
||||
* \param bdev_name Name of DAOS bdev.
|
||||
* \param new_size_in_mb The new size in MiB for this bdev
|
||||
*/
|
||||
int bdev_daos_resize(const char *bdev_name, const uint64_t new_size_in_mb);
|
||||
|
||||
#endif /* SPDK_BDEV_DAOS_H */
|
||||
|
@ -141,3 +141,46 @@ cleanup:
|
||||
|
||||
SPDK_RPC_REGISTER("bdev_daos_delete", rpc_bdev_daos_delete, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_daos_delete, delete_daos_bdev)
|
||||
|
||||
struct rpc_bdev_daos_resize {
|
||||
char *name;
|
||||
uint64_t new_size;
|
||||
};
|
||||
|
||||
static const struct spdk_json_object_decoder rpc_bdev_daos_resize_decoders[] = {
|
||||
{"name", offsetof(struct rpc_bdev_daos_resize, name), spdk_json_decode_string},
|
||||
{"new_size", offsetof(struct rpc_bdev_daos_resize, new_size), spdk_json_decode_uint64}
|
||||
};
|
||||
|
||||
static void
|
||||
free_rpc_bdev_daos_resize(struct rpc_bdev_daos_resize *req)
|
||||
{
|
||||
free(req->name);
|
||||
}
|
||||
|
||||
static void
|
||||
rpc_bdev_daos_resize(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_daos_resize req = {};
|
||||
int rc;
|
||||
|
||||
if (spdk_json_decode_object(params, rpc_bdev_daos_resize_decoders,
|
||||
SPDK_COUNTOF(rpc_bdev_daos_resize_decoders),
|
||||
&req)) {
|
||||
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
||||
"spdk_json_decode_object failed");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
rc = bdev_daos_resize(req.name, req.new_size);
|
||||
if (rc) {
|
||||
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
spdk_jsonrpc_send_bool_response(request, true);
|
||||
cleanup:
|
||||
free_rpc_bdev_daos_resize(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_daos_resize", rpc_bdev_daos_resize, SPDK_RPC_RUNTIME)
|
||||
|
@ -1613,3 +1613,16 @@ def bdev_daos_delete(client, name):
|
||||
"""
|
||||
params = {'name': name}
|
||||
return client.call('bdev_daos_delete', params)
|
||||
|
||||
|
||||
def bdev_daos_resize(client, name, new_size):
|
||||
"""Resize DAOS bdev in the system.
|
||||
Args:
|
||||
name: name of DAOS bdev to resize
|
||||
new_size: new bdev size of resize operation. The unit is MiB
|
||||
"""
|
||||
params = {
|
||||
'name': name,
|
||||
'new_size': new_size,
|
||||
}
|
||||
return client.call('bdev_daos_resize', params)
|
||||
|
@ -3104,6 +3104,17 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
|
||||
p.add_argument('name', help='DAOS bdev name')
|
||||
p.set_defaults(func=bdev_daos_delete)
|
||||
|
||||
def bdev_daos_resize(args):
|
||||
print_json(rpc.bdev.bdev_daos_resize(args.client,
|
||||
name=args.name,
|
||||
new_size=int(args.new_size)))
|
||||
|
||||
p = subparsers.add_parser('bdev_daos_resize',
|
||||
help='Resize a DAOS bdev')
|
||||
p.add_argument('name', help='DAOS bdev name')
|
||||
p.add_argument('new_size', help='new bdev size for resize operation. The unit is MiB')
|
||||
p.set_defaults(func=bdev_daos_resize)
|
||||
|
||||
def check_called_name(name):
|
||||
if name in deprecated_aliases:
|
||||
print("{} is deprecated, use {} instead.".format(name, deprecated_aliases[name]), file=sys.stderr)
|
||||
|
Loading…
Reference in New Issue
Block a user