create hublvol for migration

Author: Sadegh Savari

include/spdk/lvol.h

@@ -203,7 +203,7 @@ int spdk_lvol_create(struct spdk_lvol_store *lvs, const char *name, uint64_t sz,
 		     bool thin_provisioned, enum lvol_clear_method clear_method,
 		     uint8_t geometry, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg);
 
-int spdk_lvol_create_hublvol(struct spdk_lvol_store *lvs, spdk_lvol_op_with_handle_complete cb_fn,
+int spdk_lvol_create_hublvol(struct spdk_lvol_store *lvs, const char *name, spdk_lvol_op_with_handle_complete cb_fn,
  				void *cb_arg);
 /**
  * Create snapshot of given lvol.

lib/lvol/lvol.c

@@ -1162,7 +1162,9 @@ lvol_create_open_cb(void *cb_arg, struct spdk_blob *blob, int lvolerrno)
 	lvol->blob = blob;
 	lvol->blob_id = spdk_blob_get_id(blob);
 	lvol->map_id = spdk_blob_get_map_id(blob);
-	lvs->lvol_map.lvol[lvol->map_id] = lvol;
+	if (!lvol->hublvol) {
+		lvs->lvol_map.lvol[lvol->map_id] = lvol;
+	}
 
 	TAILQ_INSERT_TAIL(&lvol->lvol_store->lvols, lvol, link);
 
@@ -1495,7 +1497,7 @@ spdk_lvol_create(struct spdk_lvol_store *lvs, const char *name, uint64_t sz, boo
 }
 
 int
-spdk_lvol_create_hublvol(struct spdk_lvol_store *lvs, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg)
+spdk_lvol_create_hublvol(struct spdk_lvol_store *lvs, const char *name, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg)
 {
 	struct spdk_lvol_with_handle_req *req;
 	struct spdk_lvol *lvol;
@@ -1508,7 +1510,7 @@ spdk_lvol_create_hublvol(struct spdk_lvol_store *lvs, spdk_lvol_op_with_handle_c
 		return -EINVAL;
 	}
 
-	rc = lvs_verify_lvol_name(lvs, "hublvol");
+	rc = lvs_verify_lvol_name(lvs, name);
 	if (rc < 0) {
 		return rc;
 	}
@@ -1521,7 +1523,7 @@ spdk_lvol_create_hublvol(struct spdk_lvol_store *lvs, spdk_lvol_op_with_handle_c
 	req->cb_fn = cb_fn;
 	req->cb_arg = cb_arg;
 
-	lvol = lvol_alloc(lvs, "hublvol", true, LVOL_CLEAR_WITH_DEFAULT, NULL);
+	lvol = lvol_alloc(lvs, name, true, LVOL_CLEAR_WITH_DEFAULT, NULL);
 	if (!lvol) {
 		free(req);
 		SPDK_ERRLOG("Cannot alloc memory for lvol base pointer\n");

module/bdev/lvol/vbdev_lvol.c

@@ -2373,7 +2373,7 @@ vbdev_lvol_create(struct spdk_lvol_store *lvs, const char *name, uint64_t sz,
 }
 
 int
-vbdev_lvol_create_hublvol(struct spdk_lvol_store *lvs, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg)
+vbdev_lvol_create_hublvol(struct spdk_lvol_store *lvs, const char *name, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg)
 {
 	struct spdk_lvol_with_handle_req *req;
 	int rc;
@@ -2386,7 +2386,7 @@ vbdev_lvol_create_hublvol(struct spdk_lvol_store *lvs, spdk_lvol_op_with_handle_
 	req->cb_fn = cb_fn;
 	req->cb_arg = cb_arg;
 
-	rc = spdk_lvol_create_hublvol(lvs, _vbdev_lvol_create_cb, req);
+	rc = spdk_lvol_create_hublvol(lvs, name, _vbdev_lvol_create_cb, req);
 	if (rc != 0) {
 		free(req);
 	}

module/bdev/lvol/vbdev_lvol.h

@@ -41,7 +41,7 @@ int vbdev_lvol_create(struct spdk_lvol_store *lvs, const char *name, uint64_t sz
 		      spdk_lvol_op_with_handle_complete cb_fn,
 		      void *cb_arg);
 
-int vbdev_lvol_create_hublvol(struct spdk_lvol_store *lvs, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg);
+int vbdev_lvol_create_hublvol(struct spdk_lvol_store *lvs, const char *name, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg);
 int vbdev_lvol_register(struct spdk_lvol_store *lvs, const char *name, const char *registered_uuid, 
 			  uint64_t blobid, bool thin_provision, enum lvol_clear_method clear_method, 
 			  int8_t lvol_priority_class, spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg);

module/bdev/lvol/vbdev_lvol_rpc.c

@@ -434,18 +434,21 @@ SPDK_RPC_REGISTER("bdev_lvol_create", rpc_bdev_lvol_create, SPDK_RPC_RUNTIME)
 struct rpc_bdev_hublvol {
 	char *uuid;
 	char *lvs_name;
+	char *name;
 };
 
 static void
 free_rpc_bdev_hublvol(struct rpc_bdev_hublvol *req)
 {
 	free(req->uuid);
 	free(req->lvs_name);
+	free(req->name);
 }
 
 static const struct spdk_json_object_decoder rpc_bdev_hublvol_decoders[] = {
 	{"uuid", offsetof(struct rpc_bdev_hublvol, uuid), spdk_json_decode_string, true},
 	{"lvs_name", offsetof(struct rpc_bdev_hublvol, lvs_name), spdk_json_decode_string, true},
+	{"name", offsetof(struct rpc_bdev_hublvol, name), spdk_json_decode_string, true},
 };
 
 static void
@@ -493,7 +496,15 @@ rpc_bdev_lvol_create_hublvol(struct spdk_jsonrpc_request *request,
 		goto cleanup;
 	}
 
-	rc = vbdev_lvol_create_hublvol(lvs, rpc_bdev_hublvol_create_cb, request);
+	if (req.name == NULL) {
+		req.name = strdup("hublvol");
+		if (req.name == NULL) {
+			spdk_jsonrpc_send_error_response(request, -ENOMEM, spdk_strerror(ENOMEM));
+			goto cleanup;
+		}
+	}
+
+	rc = vbdev_lvol_create_hublvol(lvs, req.name, rpc_bdev_hublvol_create_cb, request);
 	if (rc < 0) {
 		spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
 		goto cleanup;
@@ -547,7 +558,15 @@ rpc_bdev_lvol_delete_hublvol(struct spdk_jsonrpc_request *request,
 		goto cleanup;
 	}
 
-	lvol = spdk_lvol_get_by_names(lvs->name, "hublvol");
+	if (req.name == NULL) {
+		req.name = strdup("hublvol");
+		if (req.name == NULL) {
+			spdk_jsonrpc_send_error_response(request, -ENOMEM, spdk_strerror(ENOMEM));
+			goto cleanup;
+		}
+	}
+
+	lvol = spdk_lvol_get_by_names(lvs->name, req.name);
 	if (!lvol) {
 		spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));
 		goto cleanup;

python/spdk/rpc/lvol.py

@@ -425,12 +425,13 @@ def bdev_lvol_add_clone(client, lvol_name=None, child_name=None):
     params = { 'lvol_name': lvol_name, 'child_name': child_name }
     return client.call('bdev_lvol_add_clone', params)
 
-def bdev_lvol_create_hublvol(client, uuid=None, lvs_name=None):
+def bdev_lvol_create_hublvol(client, uuid=None, lvs_name=None, name=None):
     """Create a logical volume on a logical volume store.
 
     Args:        
         uuid: UUID of logical volume store to create logical volume on (optional)
         lvs_name: name of logical volume store to create logical volume on (optional)
+        name: name of the logical volume to create (optional)
 
     Either uuid or lvs_name must be specified, but not both.
 
@@ -445,14 +446,18 @@ def bdev_lvol_create_hublvol(client, uuid=None, lvs_name=None):
         params['uuid'] = uuid
     if lvs_name:
         params['lvs_name'] = lvs_name
+    if name:
+        params['name'] = name
+
     return client.call('bdev_lvol_create_hublvol', params)
 
-def bdev_lvol_delete_hublvol(client, uuid=None, lvs_name=None, ):
-    """Create a logical volume on a logical volume store.
+def bdev_lvol_delete_hublvol(client, uuid=None, lvs_name=None, name=None):
+    """Delete a logical volume from a logical volume store.
 
-    Args:        
-        uuid: UUID of logical volume store to create logical volume on (optional)
-        lvs_name: name of logical volume store to create logical volume on (optional)
+    Args:
+        uuid: UUID of logical volume store to delete logical volume from (optional)
+        lvs_name: name of logical volume store to delete logical volume from (optional)
+        name: name of the logical volume to delete (optional)
 
     Either uuid or lvs_name must be specified, but not both.
 
@@ -467,6 +472,8 @@ def bdev_lvol_delete_hublvol(client, uuid=None, lvs_name=None, ):
         params['uuid'] = uuid
     if lvs_name:
         params['lvs_name'] = lvs_name
+    if name:
+        params['name'] = name
     return client.call('bdev_lvol_delete_hublvol', params)
 
 def bdev_lvol_register(client, lvol_name, registered_uuid, blobid, thin_provision=False, uuid=None, lvs_name=None, clear_method=None, lvol_priority_class=0):

scripts/rpc.py

@@ -2310,21 +2310,25 @@ def bdev_lvol_set_migration_flag(args):
     def bdev_lvol_create_hublvol(args):
         print_json(rpc.lvol.bdev_lvol_create_hublvol(args.client,
                                              uuid=args.uuid,
-                                             lvs_name=args.lvs_name))
+                                             lvs_name=args.lvs_name,
+                                             name=args.name))
 
     p = subparsers.add_parser('bdev_lvol_create_hublvol', help='Add a bdev with an logical volume backend')
     p.add_argument('-u', '--uuid', help='lvol store UUID')
     p.add_argument('-l', '--lvs-name', help='lvol store name')
+    p.add_argument('-n', '--name', help='lvol name')
     p.set_defaults(func=bdev_lvol_create_hublvol)
 
     def bdev_lvol_delete_hublvol(args):
         print_json(rpc.lvol.bdev_lvol_delete_hublvol(args.client,
                                              uuid=args.uuid,
-                                             lvs_name=args.lvs_name))
+                                             lvs_name=args.lvs_name,
+                                             name=args.name))
 
     p = subparsers.add_parser('bdev_lvol_delete_hublvol', help='Add a bdev with an logical volume backend')
     p.add_argument('-u', '--uuid', help='lvol store UUID')
     p.add_argument('-l', '--lvs-name', help='lvol store name')
+    p.add_argument('-n', '--name', help='lvol name')
     p.set_defaults(func=bdev_lvol_delete_hublvol)
 
     def bdev_lvol_register(args):