Commit b4d441fd authored by Amir Haroush's avatar Amir Haroush Committed by Jim Harris
Browse files

Revert "deprecation: remove Open CAS Framework" 



This reverts commit 32908cbf.

OCF deprecation notice has removed as
Huawei is picking up support for the OCF project.

Signed-off-by: default avatarAmir Haroush <amir.haroush@huawei.com>
Signed-off-by: default avatarShai Fultheim <shai.fultheim@huawei.com>
Change-Id: I007e80bc74dc50cfa9b8cde97fc6fdc9608d7ebd
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17894


Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 10db58ef

configure

+1 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ function usage() { 
	echo " --without-iscsi-initiator No path required."

	echo " --with-vtune=DIR          Required to profile I/O under Intel VTune Amplifier XE. (Deprecated)"

	echo " --without-vtune           example: /opt/intel/vtune_amplifier_xe_version"

	echo " --with-ocf[=DIR]          Build OCF library and bdev module. (Deprecated)"

	echo " --with-ocf[=DIR]          Build OCF library and bdev module."

	echo " --without-ocf             If argument is directory, interpret it as root of OCF repo"

	echo "                           If argument is file, interpret it as compiled OCF lib"

	echo "                           If no argument is specified, OCF git submodule is used by default"
@@ -1101,7 +1101,6 @@ if echo -e '#include <uuid/uuid.h>\nint main(void) { uuid_generate_sha1(NULL, NU 
fi



if [[ "${CONFIG[OCF]}" = "y" ]]; then

	echo "WARNING: OCF - bdev_ocf is deprecated."

	# If OCF_PATH is a file, assume it is a library and use it to compile with

	if [ -f ${CONFIG[OCF_PATH]} ]; then

		CONFIG[CUSTOMOCF]=y

deprecation.md

+0 −7
Original line number Diff line number Diff line
@@ -30,13 +30,6 @@ Please see: [UPDATE ON PMDK AND OUR LONG TERM SUPPORT STRATEGY](https://pmem.io/ 


VTune integration is in now deprecated and will be removed in SPDK 23.05.



### OCF



#### `bdev_ocf`



The Open CAS Framework (OCF) integration via bdev module and env_ocf is now deprecated

and will be removed in SPDK 23.05.



### nvme



#### `nvme_ctrlr_prepare_for_reset`

module/bdev/ocf/vbdev_ocf.c

+0 −4
Original line number Diff line number Diff line
@@ -1286,8 +1286,6 @@ error_free: 
	return rc;

}



SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.05", 0);



/* Read configuration file at the start of SPDK application

 * This adds vbdevs to global list if some mentioned in config */

static int
@@ -1295,8 +1293,6 @@ vbdev_ocf_init(void) 
{

	int status;



	SPDK_LOG_DEPRECATED(bdev_ocf);



	status = vbdev_ocf_ctx_init();

	if (status) {

		SPDK_ERRLOG("OCF ctx initialization failed with=%d\n", status);