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

rpc: Rename set_bdev_nvme_hotplug to bdev_nvme_set_hotplug. 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent eb401ec1

doc/jsonrpc.md

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

~~~



## set_bdev_nvme_hotplug {#rpc_set_bdev_nvme_hotplug}

## bdev_nvme_set_hotplug {#rpc_bdev_nvme_set_hotplug}



Change settings of the NVMe hotplug feature. If enabled, PCIe NVMe bdevs will be automatically discovered on insertion

and deleted on removal.
@@ -1464,7 +1464,7 @@ request: 
    "period_us": 2000

  },

  "jsonrpc": "2.0",

  "method": "set_bdev_nvme_hotplug",

  "method": "bdev_nvme_set_hotplug",

  "id": 1

}

~~~

module/bdev/nvme/bdev_nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ bdev_nvme_config_json(struct spdk_json_write_ctx *w) 
	 * before enabling hotplug poller.

	 */

	spdk_json_write_object_begin(w);

	spdk_json_write_named_string(w, "method", "set_bdev_nvme_hotplug");

	spdk_json_write_named_string(w, "method", "bdev_nvme_set_hotplug");



	spdk_json_write_named_object_begin(w, "params");

	spdk_json_write_named_uint64(w, "period_us", g_nvme_hotplug_poll_period_us);

module/bdev/nvme/bdev_nvme_rpc.c

+5 −4
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_hotplug_decoders[] = 
};



static void

rpc_set_bdev_nvme_hotplug_done(void *ctx)

rpc_bdev_nvme_set_hotplug_done(void *ctx)

{

	struct spdk_jsonrpc_request *request = ctx;

	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
@@ -132,7 +132,7 @@ rpc_set_bdev_nvme_hotplug_done(void *ctx) 
}



static void

spdk_rpc_set_bdev_nvme_hotplug(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_nvme_set_hotplug(struct spdk_jsonrpc_request *request,

			       const struct spdk_json_val *params)

{

	struct rpc_bdev_nvme_hotplug req = {false, 0};
@@ -145,7 +145,7 @@ spdk_rpc_set_bdev_nvme_hotplug(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	rc = spdk_bdev_nvme_set_hotplug(req.enabled, req.period_us, rpc_set_bdev_nvme_hotplug_done,

	rc = spdk_bdev_nvme_set_hotplug(req.enabled, req.period_us, rpc_bdev_nvme_set_hotplug_done,

					request);

	if (rc) {

		goto invalid;
@@ -155,7 +155,8 @@ spdk_rpc_set_bdev_nvme_hotplug(struct spdk_jsonrpc_request *request, 
invalid:

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));

}

SPDK_RPC_REGISTER("set_bdev_nvme_hotplug", spdk_rpc_set_bdev_nvme_hotplug, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_nvme_set_hotplug", spdk_rpc_bdev_nvme_set_hotplug, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(set_bdev_nvme_hotplug, bdev_nvme_set_hotplug)



struct rpc_construct_nvme {

	char *name;

scripts/config_converter.py

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ bdev_dict["set_bdev_options"] = [] 
bdev_dict["construct_split_vbdev"] = []

bdev_dict["bdev_nvme_set_options"] = []

bdev_dict["construct_nvme_bdev"] = []

bdev_dict["set_bdev_nvme_hotplug"] = []

bdev_dict["bdev_nvme_set_hotplug"] = []

bdev_dict["bdev_malloc_create"] = []

bdev_dict["bdev_aio_create"] = []

bdev_dict["construct_pmem_bdev"] = []
@@ -238,7 +238,7 @@ def get_nvme_bdev_json(config, section): 
    params[6][3] = params[6][3] * 100

    nvme_json.append({

        "params": to_json_params(params[5:7]),

        "method": "set_bdev_nvme_hotplug"

        "method": "bdev_nvme_set_hotplug"

    })

    nvme_json.append({

        "params": to_json_params(params[0:5]),

scripts/rpc.py

+4 −4
Original line number Diff line number Diff line
@@ -343,16 +343,16 @@ if __name__ == "__main__": 
                   help='The number of requests allocated for each NVMe I/O queue. Default: 512', type=int)

    p.set_defaults(func=bdev_nvme_set_options)



    def set_bdev_nvme_hotplug(args):

        rpc.bdev.set_bdev_nvme_hotplug(args.client, enable=args.enable, period_us=args.period_us)

    def bdev_nvme_set_hotplug(args):

        rpc.bdev.bdev_nvme_set_hotplug(args.client, enable=args.enable, period_us=args.period_us)



    p = subparsers.add_parser('set_bdev_nvme_hotplug',

    p = subparsers.add_parser('bdev_nvme_set_hotplug', aliases=['set_bdev_nvme_hotplug'],

                              help='Set hotplug options for bdev nvme type.')

    p.add_argument('-d', '--disable', dest='enable', default=False, action='store_false', help="Disable hotplug (default)")

    p.add_argument('-e', '--enable', dest='enable', action='store_true', help="Enable hotplug")

    p.add_argument('-r', '--period-us',

                   help='How often the hotplug is processed for insert and remove events', type=int)

    p.set_defaults(func=set_bdev_nvme_hotplug)

    p.set_defaults(func=bdev_nvme_set_hotplug)



    def construct_nvme_bdev(args):

        print_array(rpc.bdev.construct_nvme_bdev(args.client,