update 2

Author: PhanLe1010

include/spdk/blob.h

@@ -162,10 +162,10 @@ typedef void (*spdk_blob_shallow_copy_status)(uint64_t copied_clusters, uint64_t
 /**
  * Blob deep copy status callback.
  *
- * \param copied_clusters Actual number of copied clusters by the deep copy operation
+ * \param processed_clusters Number of processed clusters by the deep copy operation
  * \param cb_arg Callback argument.
  */
-typedef void (*spdk_blob_deep_copy_status)(uint64_t copied_clusters,
+typedef void (*spdk_blob_deep_copy_status)(uint64_t processed_clusters,
 		void *cb_arg);
 
 /**

lib/blob/blobstore.c

@@ -7892,10 +7892,6 @@ struct deep_copy_ctx {
 	/* Struct for external device writing */
 	struct spdk_bs_dev_cb_args ext_args;
 
-	// TODO: how to determine this
-	/* Actual number of copied clusters */
-	uint64_t copied_clusters_count;
-
 	/* Status callback for updates about the ongoing operation */
 	spdk_blob_deep_copy_status status_cb;
 
@@ -7937,8 +7933,6 @@ bs_deep_copy_bdev_write_cpl(struct spdk_io_channel *channel, void *cb_arg, int b
 	}
 
 	if (ctx->status_cb) {
-		// TODO: How to determine this
-		// ctx->copied_clusters_count++;
 		ctx->status_cb(ctx->cluster, ctx->status_cb_arg);
 	}
 

module/bdev/lvol/vbdev_lvol_rpc.c

@@ -41,7 +41,7 @@ struct rpc_deep_copy_status {
 	 * a negative value is the -errno of an aborted operation
 	 */
 	int					result;
-	uint64_t				copied_clusters;
+	uint64_t				processed_clusters;
 	uint64_t				total_clusters;
 	LIST_ENTRY(rpc_deep_copy_status)	link;
 };
@@ -1972,12 +1972,12 @@ rpc_bdev_lvol_deep_copy_cb(void *cb_arg, int lvolerrno)
 }
 
 static void
-rpc_bdev_lvol_deep_copy_status_cb(uint64_t copied_clusters,
+rpc_bdev_lvol_deep_copy_status_cb(uint64_t processed_clusters,
 					 void *cb_arg)
 {
 	struct rpc_deep_copy_status *status = cb_arg;
 
-	status->copied_clusters = copied_clusters;
+	status->processed_clusters = processed_clusters;
 }
 
 
@@ -2025,7 +2025,7 @@ rpc_bdev_lvol_start_deep_copy(struct spdk_jsonrpc_request *request,
 		goto cleanup;
 	}
 
-	status->operation_id = ++g_shallow_copy_count;
+	status->operation_id = ++g_deep_copy_count;
 	status->total_clusters = spdk_blob_get_num_clusters(src_lvol->blob);
 
 	ctx = calloc(1, sizeof(*ctx));
@@ -2088,7 +2088,7 @@ rpc_bdev_lvol_check_deep_copy(struct spdk_jsonrpc_request *request,
 	struct rpc_bdev_lvol_deep_copy_status req = {};
 	struct rpc_deep_copy_status *status;
 	struct spdk_json_write_ctx *w;
-	uint64_t copied_clusters, total_clusters;
+	uint64_t processed_clusters, total_clusters;
 	int result;
 
 	SPDK_INFOLOG(lvol_rpc, "Deep copy check\n");
@@ -2114,19 +2114,19 @@ rpc_bdev_lvol_check_deep_copy(struct spdk_jsonrpc_request *request,
 		goto cleanup;
 	}
 
-	copied_clusters = status->copied_clusters;
+	processed_clusters = status->processed_clusters;
 	total_clusters = status->total_clusters;
 	result = status->result;
 
 	w = spdk_jsonrpc_begin_result(request);
 
 	spdk_json_write_object_begin(w);
 
-	spdk_json_write_named_uint64(w, "copied_clusters", copied_clusters);
+	spdk_json_write_named_uint64(w, "processed_clusters", processed_clusters);
 	spdk_json_write_named_uint64(w, "total_clusters", total_clusters);
-	if (copied_clusters < total_clusters && result == 0) {
+	if (processed_clusters < total_clusters && result == 0) {
 		spdk_json_write_named_string(w, "state", "in progress");
-	} else if (copied_clusters == total_clusters && result == 0) {
+	} else if (processed_clusters == total_clusters && result == 0) {
 		spdk_json_write_named_string(w, "state", "complete");
 		LIST_REMOVE(status, link);
 		free(status);