Commit cbc1e069 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

configure: allow cuncurrent build of RBD and reduce 



This was disabled in configure because at one time there was an ISA-L
dependency break between the RBD libraries and our own submodule.
It seems that the dependency break was fixed a while ago, but the check
to not allow one to build with the other was never removed.
Unfortunately, I don't have the details on what that fix was.

Either way, this compilation works now.

Change-Id: Ic249791549dae36c7279114d67e77be94e842ddf
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479726


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

configure

+7 −13
Original line number Diff line number Diff line
@@ -574,11 +574,6 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then 
		exit 1

	fi



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

		echo "ISAL and RBD cannot co-exist currently so disabling ISAL and compression."

		CONFIG[ISAL]=n

		CONFIG[REDUCE]=n

	else

	cd $rootdir/isa-l

	ISAL_LOG=$rootdir/isa-l/spdk-isal.log

	echo -n "Configuring ISA-L (logfile: $ISAL_LOG)..."
@@ -587,7 +582,6 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then 
	echo "done."

	cd $rootdir

fi

fi



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

	if ! echo -e '#include <libpmemblk.h>\nint main(void) { return 0; }\n' \

test/common/autotest_common.sh

+1 −5
Original line number Diff line number Diff line
@@ -207,11 +207,7 @@ if [ -f /usr/include/libpmem.h ] && [ $SPDK_TEST_REDUCE -eq 1 ]; then 
fi



if [ -d /usr/include/rbd ] &&  [ -d /usr/include/rados ] && [ $SPDK_TEST_RBD -eq 1 ]; then

	if [ $SPDK_TEST_ISAL -eq 0 ]; then

	config_params+=' --with-rbd'

	else

		echo "rbd not enabled because isal is enabled."

	fi

fi



if [ $SPDK_TEST_VPP -eq 1 ]; then