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

rpc: Rename pmem_pool_info bdev_pmem_get_pool_info 



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


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

doc/bdev.md

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


`rpc.py bdev_pmem_create_pool /path/to/pmem_pool 25 4096`



To get information on created pmem pool file user can use `pmem_pool_info` RPC command.

To get information on created pmem pool file user can use `bdev_pmem_get_pool_info` RPC command.



Example command



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

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



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

doc/jsonrpc.md

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

~~~



## pmem_pool_info {#rpc_pmem_pool_info}

## bdev_pmem_get_pool_info {#rpc_bdev_pmem_get_pool_info}



Retrieve basic information about PMDK memory pool.
@@ -2173,7 +2173,7 @@ request: 
    "pmem_file": "/tmp/pmem_file"

  },

  "jsonrpc": "2.0",

  "method": "pmem_pool_info",

  "method": "bdev_pmem_get_pool_info",

  "id": 1

}

~~~

module/bdev/pmem/bdev_pmem_rpc.c

+12 −11
Original line number Diff line number Diff line
@@ -215,31 +215,31 @@ cleanup: 
SPDK_RPC_REGISTER("bdev_pmem_create_pool", spdk_rpc_bdev_pmem_create_pool, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_create_pool, create_pmem_pool)



struct rpc_pmem_pool_info {

struct rpc_bdev_pmem_get_pool_info {

	char *pmem_file;

};



static const struct spdk_json_object_decoder rpc_pmem_pool_info_decoders[] = {

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

static const struct spdk_json_object_decoder rpc_bdev_pmem_get_pool_info_decoders[] = {

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

};



static void

free_rpc_pmem_pool_info(struct rpc_pmem_pool_info *req)

free_rpc_bdev_pmem_get_pool_info(struct rpc_bdev_pmem_get_pool_info *req)

{

	free(req->pmem_file);

}



static void

spdk_rpc_pmem_pool_info(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_pmem_get_pool_info(struct spdk_jsonrpc_request *request,

				 const struct spdk_json_val *params)

{

	struct rpc_pmem_pool_info req = {};

	struct rpc_bdev_pmem_get_pool_info req = {};

	struct spdk_json_write_ctx *w;

	size_t num_blocks, block_size;

	PMEMblkpool *pbp;



	if (spdk_json_decode_object(params, rpc_pmem_pool_info_decoders,

				    SPDK_COUNTOF(rpc_pmem_pool_info_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_pmem_get_pool_info_decoders,

				    SPDK_COUNTOF(rpc_bdev_pmem_get_pool_info_decoders),

				    &req)) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");
@@ -279,9 +279,10 @@ spdk_rpc_pmem_pool_info(struct spdk_jsonrpc_request *request, 
	spdk_jsonrpc_end_result(request, w);



cleanup:

	free_rpc_pmem_pool_info(&req);

	free_rpc_bdev_pmem_get_pool_info(&req);

}

SPDK_RPC_REGISTER("pmem_pool_info", spdk_rpc_pmem_pool_info, SPDK_RPC_RUNTIME)

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 {

	char *pmem_file;

scripts/rpc.py

+6 −5
Original line number Diff line number Diff line
@@ -1722,13 +1722,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('block_size', help='Block size for this pmem pool', type=int)

    p.set_defaults(func=bdev_pmem_create_pool)



    def pmem_pool_info(args):

        print_dict(rpc.pmem.pmem_pool_info(args.client,

    def bdev_pmem_get_pool_info(args):

        print_dict(rpc.pmem.bdev_pmem_get_pool_info(args.client,

                                                    pmem_file=args.pmem_file))



    p = subparsers.add_parser('pmem_pool_info', help='Display pmem pool info and check consistency')

    p = subparsers.add_parser('bdev_pmem_get_pool_info', aliases=['pmem_pool_info'],

                              help='Display pmem pool info and check consistency')

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

    p.set_defaults(func=pmem_pool_info)

    p.set_defaults(func=bdev_pmem_get_pool_info)



    def delete_pmem_pool(args):

        rpc.pmem.delete_pmem_pool(args.client,

scripts/rpc/pmem.py

+3 −2
Original line number Diff line number Diff line
@@ -15,13 +15,14 @@ def bdev_pmem_create_pool(client, pmem_file, num_blocks, block_size): 
    return client.call('bdev_pmem_create_pool', params)





def pmem_pool_info(client, pmem_file):

@deprecated_alias('pmem_pool_info')

def bdev_pmem_get_pool_info(client, pmem_file):

    """Get details about pmem pool.

    Args:

        pmem_file: path to pmem pool

    """

    params = {'pmem_file': pmem_file}

    return client.call('pmem_pool_info', params)

    return client.call('bdev_pmem_get_pool_info', params)





def delete_pmem_pool(client, pmem_file):