RPC: rename rpc snapshot_lvol_bdev to bdev_lvol_snapshot (f5cf8ea1) · Commits · Public Repositories / spdk

doc/jsonrpc.md

+3 −3

Original line number	Diff line number	Diff line
		@@ -307,7 +307,7 @@ Example response:
		"bdev_lvol_inflate",
		"bdev_lvol_rename",
		"bdev_lvol_clone",
		"snapshot_lvol_bdev",
		"bdev_lvol_snapshot",
		"construct_lvol_bdev",
		"destroy_lvol_store",
		"rename_lvol_store",
		@@ -4989,7 +4989,7 @@ Example response:
		}
		~~~

		## snapshot_lvol_bdev {#rpc_snapshot_lvol_bdev}
		## bdev_lvol_snapshot {#rpc_bdev_lvol_snapshot}

		Capture a snapshot of the current state of a logical volume.

		@@ -5011,7 +5011,7 @@ Example request:
		~~~
		{
		"jsonrpc": "2.0",
		"method": "snapshot_lvol_bdev",
		"method": "bdev_lvol_snapshot",
		"id": 1,
		"params": {
		"lvol_name": "1b38702c-7f0c-411e-a962-92c6a5a8a602",

doc/lvol.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ destroy_lvol_bdev [-h] bdev_name
		Deletes a logical volume previously created by construct_lvol_bdev.
		optional arguments:
		-h, --help show help
		snapshot_lvol_bdev [-h] lvol_name snapshot_name
		bdev_lvol_snapshot [-h] lvol_name snapshot_name
		Create a snapshot with snapshot_name of a given lvol bdev.
		optional arguments:
		-h, --help show help

module/bdev/lvol/vbdev_lvol_rpc.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -405,25 +405,25 @@ cleanup:

		SPDK_RPC_REGISTER("construct_lvol_bdev", spdk_rpc_construct_lvol_bdev, SPDK_RPC_RUNTIME)

		struct rpc_snapshot_lvol_bdev {
		struct rpc_bdev_lvol_snapshot {
		char *lvol_name;
		char *snapshot_name;
		};

		static void
		free_rpc_snapshot_lvol_bdev(struct rpc_snapshot_lvol_bdev *req)
		free_rpc_bdev_lvol_snapshot(struct rpc_bdev_lvol_snapshot *req)
		{
		free(req->lvol_name);
		free(req->snapshot_name);
		}

		static const struct spdk_json_object_decoder rpc_snapshot_lvol_bdev_decoders[] = {
		{"lvol_name", offsetof(struct rpc_snapshot_lvol_bdev, lvol_name), spdk_json_decode_string},
		{"snapshot_name", offsetof(struct rpc_snapshot_lvol_bdev, snapshot_name), spdk_json_decode_string},
		static const struct spdk_json_object_decoder rpc_bdev_lvol_snapshot_decoders[] = {
		{"lvol_name", offsetof(struct rpc_bdev_lvol_snapshot, lvol_name), spdk_json_decode_string},
		{"snapshot_name", offsetof(struct rpc_bdev_lvol_snapshot, snapshot_name), spdk_json_decode_string},
		};

		static void
		_spdk_rpc_snapshot_lvol_bdev_cb(void cb_arg, struct spdk_lvol lvol, int lvolerrno)
		_spdk_rpc_bdev_lvol_snapshot_cb(void cb_arg, struct spdk_lvol lvol, int lvolerrno)
		{
		struct spdk_json_write_ctx *w;
		struct spdk_jsonrpc_request *request = cb_arg;
		@@ -443,17 +443,17 @@ invalid:
		}

		static void
		spdk_rpc_snapshot_lvol_bdev(struct spdk_jsonrpc_request *request,
		spdk_rpc_bdev_lvol_snapshot(struct spdk_jsonrpc_request *request,
		const struct spdk_json_val *params)
		{
		struct rpc_snapshot_lvol_bdev req = {};
		struct rpc_bdev_lvol_snapshot req = {};
		struct spdk_bdev *bdev;
		struct spdk_lvol *lvol;

		SPDK_INFOLOG(SPDK_LOG_LVOL_RPC, "Snapshotting blob\n");

		if (spdk_json_decode_object(params, rpc_snapshot_lvol_bdev_decoders,
		SPDK_COUNTOF(rpc_snapshot_lvol_bdev_decoders),
		if (spdk_json_decode_object(params, rpc_bdev_lvol_snapshot_decoders,
		SPDK_COUNTOF(rpc_bdev_lvol_snapshot_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,
		@@ -475,13 +475,14 @@ spdk_rpc_snapshot_lvol_bdev(struct spdk_jsonrpc_request *request,
		goto cleanup;
		}

		vbdev_lvol_create_snapshot(lvol, req.snapshot_name, _spdk_rpc_snapshot_lvol_bdev_cb, request);
		vbdev_lvol_create_snapshot(lvol, req.snapshot_name, _spdk_rpc_bdev_lvol_snapshot_cb, request);

		cleanup:
		free_rpc_snapshot_lvol_bdev(&req);
		free_rpc_bdev_lvol_snapshot(&req);
		}

		SPDK_RPC_REGISTER("snapshot_lvol_bdev", spdk_rpc_snapshot_lvol_bdev, SPDK_RPC_RUNTIME)
		SPDK_RPC_REGISTER("bdev_lvol_snapshot", spdk_rpc_bdev_lvol_snapshot, SPDK_RPC_RUNTIME)
		SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_snapshot, snapshot_lvol_bdev)

		struct rpc_bdev_lvol_clone {
		char *snapshot_name;

scripts/rpc.py

+5 −4

Original line number	Diff line number	Diff line
		@@ -1196,15 +1196,16 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
		p.add_argument('size', help='size in MiB for this bdev', type=int)
		p.set_defaults(func=construct_lvol_bdev)

		def snapshot_lvol_bdev(args):
		print_json(rpc.lvol.snapshot_lvol_bdev(args.client,
		def bdev_lvol_snapshot(args):
		print_json(rpc.lvol.bdev_lvol_snapshot(args.client,
		lvol_name=args.lvol_name,
		snapshot_name=args.snapshot_name))

		p = subparsers.add_parser('snapshot_lvol_bdev', help='Create a snapshot of an lvol bdev')
		p = subparsers.add_parser('bdev_lvol_snapshot', aliases=['snapshot_lvol_bdev'],
		help='Create a snapshot of an lvol bdev')
		p.add_argument('lvol_name', help='lvol bdev name')
		p.add_argument('snapshot_name', help='lvol snapshot name')
		p.set_defaults(func=snapshot_lvol_bdev)
		p.set_defaults(func=bdev_lvol_snapshot)

		def bdev_lvol_clone(args):
		print_json(rpc.lvol.bdev_lvol_clone(args.client,

scripts/rpc/lvol.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -65,7 +65,8 @@ def construct_lvol_bdev(client, lvol_name, size, thin_provision=False, uuid=None
		return client.call('construct_lvol_bdev', params)


		def snapshot_lvol_bdev(client, lvol_name, snapshot_name):
		@deprecated_alias('snapshot_lvol_bdev')
		def bdev_lvol_snapshot(client, lvol_name, snapshot_name):
		"""Capture a snapshot of the current state of a logical volume.

		Args:
		@@ -79,7 +80,7 @@ def snapshot_lvol_bdev(client, lvol_name, snapshot_name):
		'lvol_name': lvol_name,
		'snapshot_name': snapshot_name
		}
		return client.call('snapshot_lvol_bdev', params)
		return client.call('bdev_lvol_snapshot', params)


		@deprecated_alias('clone_lvol_bdev')