Commit 6c425dea authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

rpc: Rename delete_pmem_pool to bdev_pmem_delete_pool 



Change-Id: I3c179e4e87f0039af29938b553957989a2d9c16b
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466887


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent a6aeb969

doc/bdev.md

+2 −2
Original line number Diff line number Diff line
@@ -521,11 +521,11 @@ Example command 


`rpc.py bdev_pmem_get_pool_info /path/to/pmem_pool`



To remove pmem pool file user can use `delete_pmem_pool` RPC command.

To remove pmem pool file user can use `bdev_pmem_delete_pool` RPC command.



Example command



`rpc.py delete_pmem_pool /path/to/pmem_pool`

`rpc.py bdev_pmem_delete_pool /path/to/pmem_pool`



To create bdev based on pmemblk pool file user should use `bdev_pmem_create ` RPC

command.

doc/jsonrpc.md

+2 −2
Original line number Diff line number Diff line
@@ -2193,7 +2193,7 @@ Example response: 
}

~~~



## delete_pmem_pool {#rpc_delete_pmem_pool}

## bdev_pmem_delete_pool {#rpc_bdev_pmem_delete_pool}



Delete pmem pool by removing file `pmem_file`. This method will fail if `pmem_file` is not a

valid pmem pool file.
@@ -2216,7 +2216,7 @@ Example request: 
    "pmem_file": "/tmp/pmem_file"

  },

  "jsonrpc": "2.0",

  "method": "delete_pmem_pool",

  "method": "bdev_pmem_delete_pool",

  "id": 1

}

~~~

module/bdev/pmem/bdev_pmem_rpc.c

+12 −11
Original line number Diff line number Diff line
@@ -284,30 +284,30 @@ cleanup: 
SPDK_RPC_REGISTER("bdev_pmem_get_pool_info", spdk_rpc_bdev_pmem_get_pool_info, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_get_pool_info, pmem_pool_info)



struct rpc_delete_pmem_pool {

struct rpc_bdev_pmem_delete_pool {

	char *pmem_file;

};



static const struct spdk_json_object_decoder rpc_delete_pmem_pool_decoders[] = {

	{"pmem_file", offsetof(struct rpc_delete_pmem_pool, pmem_file), spdk_json_decode_string},

static const struct spdk_json_object_decoder rpc_bdev_pmem_delete_pool_decoders[] = {

	{"pmem_file", offsetof(struct rpc_bdev_pmem_delete_pool, pmem_file), spdk_json_decode_string},

};



static void

free_rpc_delete_pmem_pool(struct rpc_delete_pmem_pool *req)

free_rpc_bdev_pmem_delete_pool(struct rpc_bdev_pmem_delete_pool *req)

{

	free(req->pmem_file);

}



static void

spdk_rpc_delete_pmem_pool(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_pmem_delete_pool(struct spdk_jsonrpc_request *request,

			       const struct spdk_json_val *params)

{

	struct rpc_delete_pmem_pool req = {};

	struct rpc_bdev_pmem_delete_pool req = {};

	struct spdk_json_write_ctx *w;

	int rc;



	if (spdk_json_decode_object(params, rpc_delete_pmem_pool_decoders,

				    SPDK_COUNTOF(rpc_delete_pmem_pool_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_pmem_delete_pool_decoders,

				    SPDK_COUNTOF(rpc_bdev_pmem_delete_pool_decoders),

				    &req)) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");
@@ -331,6 +331,7 @@ spdk_rpc_delete_pmem_pool(struct spdk_jsonrpc_request *request, 
	spdk_jsonrpc_end_result(request, w);



cleanup:

	free_rpc_delete_pmem_pool(&req);

	free_rpc_bdev_pmem_delete_pool(&req);

}

SPDK_RPC_REGISTER("delete_pmem_pool", spdk_rpc_delete_pmem_pool, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("bdev_pmem_delete_pool", spdk_rpc_bdev_pmem_delete_pool, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_delete_pool, delete_pmem_pool)

scripts/rpc.py

+6 −5
Original line number Diff line number Diff line
@@ -1731,13 +1731,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('pmem_file', help='Path to pmemblk pool file')

    p.set_defaults(func=bdev_pmem_get_pool_info)



    def delete_pmem_pool(args):

        rpc.pmem.delete_pmem_pool(args.client,

    def bdev_pmem_delete_pool(args):

        rpc.pmem.bdev_pmem_delete_pool(args.client,

                                       pmem_file=args.pmem_file)



    p = subparsers.add_parser('delete_pmem_pool', help='Delete pmem pool')

    p = subparsers.add_parser('bdev_pmem_delete_pool', aliases=['delete_pmem_pool'],

                              help='Delete pmem pool')

    p.add_argument('pmem_file', help='Path to pmemblk pool file')

    p.set_defaults(func=delete_pmem_pool)

    p.set_defaults(func=bdev_pmem_delete_pool)



    # subsystem

    def get_subsystems(args):

scripts/rpc/pmem.py

+3 −2
Original line number Diff line number Diff line
@@ -25,10 +25,11 @@ def bdev_pmem_get_pool_info(client, pmem_file): 
    return client.call('bdev_pmem_get_pool_info', params)





def delete_pmem_pool(client, pmem_file):

@deprecated_alias('delete_pmem_pool')

def bdev_pmem_delete_pool(client, pmem_file):

    """Delete pmem pool.

    Args:

        pmem_file: path to pmem pool

    """

    params = {'pmem_file': pmem_file}

    return client.call('delete_pmem_pool', params)
 
    return client.call('bdev_pmem_delete_pool', params)