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

RPC: rename set_bdev_qd_sampling_period to bdev_set_qd_sampling_period 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent 2c49e910

module/bdev/rpc/bdev_rpc.c

+14 −12
Original line number Diff line number Diff line
@@ -354,33 +354,33 @@ spdk_rpc_bdev_get_bdevs(struct spdk_jsonrpc_request *request, 
SPDK_RPC_REGISTER("bdev_get_bdevs", spdk_rpc_bdev_get_bdevs, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_get_bdevs, get_bdevs)



struct rpc_set_bdev_qd_sampling_period {

struct rpc_bdev_set_qd_sampling_period {

	char *name;

	uint64_t period;

};



static void

free_rpc_set_bdev_qd_sampling_period(struct rpc_set_bdev_qd_sampling_period *r)

free_rpc_bdev_set_qd_sampling_period(struct rpc_bdev_set_qd_sampling_period *r)

{

	free(r->name);

}



static const struct spdk_json_object_decoder

	rpc_set_bdev_qd_sampling_period_decoders[] = {

	{"name", offsetof(struct rpc_set_bdev_qd_sampling_period, name), spdk_json_decode_string},

	{"period", offsetof(struct rpc_set_bdev_qd_sampling_period, period), spdk_json_decode_uint64},

	rpc_bdev_set_qd_sampling_period_decoders[] = {

	{"name", offsetof(struct rpc_bdev_set_qd_sampling_period, name), spdk_json_decode_string},

	{"period", offsetof(struct rpc_bdev_set_qd_sampling_period, period), spdk_json_decode_uint64},

};



static void

spdk_rpc_set_bdev_qd_sampling_period(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_set_qd_sampling_period(struct spdk_jsonrpc_request *request,

				     const struct spdk_json_val *params)

{

	struct rpc_set_bdev_qd_sampling_period req = {0};

	struct rpc_bdev_set_qd_sampling_period req = {0};

	struct spdk_bdev *bdev;

	struct spdk_json_write_ctx *w;



	if (spdk_json_decode_object(params, rpc_set_bdev_qd_sampling_period_decoders,

				    SPDK_COUNTOF(rpc_set_bdev_qd_sampling_period_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_set_qd_sampling_period_decoders,

				    SPDK_COUNTOF(rpc_bdev_set_qd_sampling_period_decoders),

				    &req)) {

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
@@ -402,11 +402,13 @@ spdk_rpc_set_bdev_qd_sampling_period(struct spdk_jsonrpc_request *request, 
	spdk_jsonrpc_end_result(request, w);



cleanup:

	free_rpc_set_bdev_qd_sampling_period(&req);

	free_rpc_bdev_set_qd_sampling_period(&req);

}

SPDK_RPC_REGISTER("set_bdev_qd_sampling_period",

		  spdk_rpc_set_bdev_qd_sampling_period,

SPDK_RPC_REGISTER("bdev_set_qd_sampling_period",

		  spdk_rpc_bdev_set_qd_sampling_period,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_set_qd_sampling_period,

				   set_bdev_qd_sampling_period)



struct rpc_set_bdev_qos_limit {

	char		*name;

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -604,17 +604,18 @@ if __name__ == "__main__": 
    p.add_argument('name', help='bdev name')

    p.set_defaults(func=get_bdev_histogram)



    def set_bdev_qd_sampling_period(args):

        rpc.bdev.set_bdev_qd_sampling_period(args.client,

    def bdev_set_qd_sampling_period(args):

        rpc.bdev.bdev_set_qd_sampling_period(args.client,

                                             name=args.name,

                                             period=args.period)



    p = subparsers.add_parser('set_bdev_qd_sampling_period', help="Enable or disable tracking of a bdev's queue depth.")

    p = subparsers.add_parser('bdev_set_qd_sampling_period', aliases=['set_bdev_qd_sampling_period'],

                              help="Enable or disable tracking of a bdev's queue depth.")

    p.add_argument('name', help='Blockdev name. Example: Malloc0')

    p.add_argument('period', help='Period with which to poll the block device queue depth in microseconds.'

                   ' If set to 0, polling will be disabled.',

                   type=int)

    p.set_defaults(func=set_bdev_qd_sampling_period)

    p.set_defaults(func=bdev_set_qd_sampling_period)



    def set_bdev_qos_limit(args):

        rpc.bdev.set_bdev_qos_limit(args.client,

scripts/rpc/bdev.py

+3 −2
Original line number Diff line number Diff line
@@ -775,7 +775,8 @@ def bdev_error_inject_error(client, name, io_type, error_type, num=1): 
    return client.call('bdev_error_inject_error', params)





def set_bdev_qd_sampling_period(client, name, period):

@deprecated_alias('set_bdev_qd_sampling_period')

def bdev_set_qd_sampling_period(client, name, period):

    """Enable queue depth tracking on a specified bdev.



    Args:
@@ -786,7 +787,7 @@ def set_bdev_qd_sampling_period(client, name, period): 
    params = {}

    params['name'] = name

    params['period'] = period

    return client.call('set_bdev_qd_sampling_period', params)

    return client.call('bdev_set_qd_sampling_period', params)





def set_bdev_qos_limit(