Commit 4c049618 authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Ben Walker
Browse files

RPC: rename rpc destroy_lvol_store to bdev_lvol_delete_lvstore 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I4d10a4908c49366117e0e40d15a646716c7adcbf
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466723


Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent c57cd922

doc/bdev.md

+3 −3
Original line number Diff line number Diff line
@@ -450,13 +450,13 @@ Example response 
}

~~~



To delete lvol store user should use `destroy_lvol_store` RPC command.

To delete lvol store user should use `bdev_lvol_delete_lvstore` RPC command.



Example commands



`rpc.py destroy_lvol_store -u 330a6ab2-f468-11e7-983e-001e67edf35d`

`rpc.py bdev_lvol_delete_lvstore -u 330a6ab2-f468-11e7-983e-001e67edf35d`



`rpc.py destroy_lvol_store -l lvs`

`rpc.py bdev_lvol_delete_lvstore -l lvs`



## Lvols {#bdev_ug_lvols}

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ Example response: 
    "bdev_lvol_clone",

    "bdev_lvol_snapshot",

    "bdev_lvol_create",

    "destroy_lvol_store",

    "bdev_lvol_delete_lvstore",

    "rename_lvol_store",

    "construct_lvol_store"

  ]
@@ -4814,7 +4814,7 @@ Example response: 
}

~~~



## destroy_lvol_store {#rpc_destroy_lvol_store}

## bdev_lvol_delete_lvstore {#rpc_bdev_lvol_delete_lvstore}



Destroy a logical volume store.
@@ -4834,7 +4834,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "destroy_lvol_store",

  "method": "bdev_lvol_delete_lvstore",

  "id": 1

  "params": {

    "uuid": "a9959197-b5e2-4f2d-8095-251ffb6985a5"

doc/lvol.md

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ construct_lvol_store [-h] [-c CLUSTER_SZ] bdev_name lvs_name 
    -h  show help

    -c  CLUSTER_SZ Specifies the size of cluster. By default its 4MiB.

    --clear-method specify data region clear method "none", "unmap" (default), "write_zeroes"

destroy_lvol_store [-h] [-u UUID] [-l LVS_NAME]

bdev_lvol_delete_lvstore [-h] [-u UUID] [-l LVS_NAME]

    Destroy lvolstore on specified bdev. Removes lvolstore along with lvols on

    it. User can identify lvol store by UUID or its name. Note that destroying

    lvolstore requires using this call, while deleting single lvol requires

module/bdev/lvol/vbdev_lvol_rpc.c

+13 −12
Original line number Diff line number Diff line
@@ -237,21 +237,21 @@ cleanup: 
}

SPDK_RPC_REGISTER("rename_lvol_store", spdk_rpc_rename_lvol_store, SPDK_RPC_RUNTIME)



struct rpc_destroy_lvol_store {

struct rpc_bdev_lvol_delete_lvstore {

	char *uuid;

	char *lvs_name;

};



static void

free_rpc_destroy_lvol_store(struct rpc_destroy_lvol_store *req)

free_rpc_bdev_lvol_delete_lvstore(struct rpc_bdev_lvol_delete_lvstore *req)

{

	free(req->uuid);

	free(req->lvs_name);

}



static const struct spdk_json_object_decoder rpc_destroy_lvol_store_decoders[] = {

	{"uuid", offsetof(struct rpc_destroy_lvol_store, uuid), spdk_json_decode_string, true},

	{"lvs_name", offsetof(struct rpc_destroy_lvol_store, lvs_name), spdk_json_decode_string, true},

static const struct spdk_json_object_decoder rpc_bdev_lvol_delete_lvstore_decoders[] = {

	{"uuid", offsetof(struct rpc_bdev_lvol_delete_lvstore, uuid), spdk_json_decode_string, true},

	{"lvs_name", offsetof(struct rpc_bdev_lvol_delete_lvstore, lvs_name), spdk_json_decode_string, true},

};



static void
@@ -275,15 +275,15 @@ invalid: 
}



static void

spdk_rpc_destroy_lvol_store(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_lvol_delete_lvstore(struct spdk_jsonrpc_request *request,

				  const struct spdk_json_val *params)

{

	struct rpc_destroy_lvol_store req = {};

	struct rpc_bdev_lvol_delete_lvstore req = {};

	struct spdk_lvol_store *lvs = NULL;

	int rc;



	if (spdk_json_decode_object(params, rpc_destroy_lvol_store_decoders,

				    SPDK_COUNTOF(rpc_destroy_lvol_store_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_lvol_delete_lvstore_decoders,

				    SPDK_COUNTOF(rpc_bdev_lvol_delete_lvstore_decoders),

				    &req)) {

		SPDK_INFOLOG(SPDK_LOG_LVOL_RPC, "spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
@@ -300,9 +300,10 @@ spdk_rpc_destroy_lvol_store(struct spdk_jsonrpc_request *request, 
	vbdev_lvs_destruct(lvs, _spdk_rpc_lvol_store_destroy_cb, request);



cleanup:

	free_rpc_destroy_lvol_store(&req);

	free_rpc_bdev_lvol_delete_lvstore(&req);

}

SPDK_RPC_REGISTER("destroy_lvol_store", spdk_rpc_destroy_lvol_store, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_lvol_delete_lvstore", spdk_rpc_bdev_lvol_delete_lvstore, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_delete_lvstore, destroy_lvol_store)



struct rpc_bdev_lvol_create {

	char *uuid;

scripts/rpc.py

+7 −6
Original line number Diff line number Diff line
@@ -1277,15 +1277,16 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('name', help='lvol bdev name')

    p.set_defaults(func=bdev_lvol_delete)



    def destroy_lvol_store(args):

        rpc.lvol.destroy_lvol_store(args.client,

    def bdev_lvol_delete_lvstore(args):

        rpc.lvol.bdev_lvol_delete_lvstore(args.client,

                                          uuid=args.uuid,

                                          lvs_name=args.lvs_name)



    p = subparsers.add_parser('destroy_lvol_store', help='Destroy an logical volume store')

    p = subparsers.add_parser('bdev_lvol_delete_lvstore', aliases=['destroy_lvol_store'],

                              help='Destroy an logical volume store')

    p.add_argument('-u', '--uuid', help='lvol store UUID', required=False)

    p.add_argument('-l', '--lvs-name', help='lvol store name', required=False)

    p.set_defaults(func=destroy_lvol_store)

    p.set_defaults(func=bdev_lvol_delete_lvstore)



    def bdev_lvol_get_lvstores(args):

        print_dict(rpc.lvol.bdev_lvol_get_lvstores(args.client,