Commit a0662819 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

blobfs/fuse: add 'event' as dependency for blobfs_bdev 



This was missed in CI, due to disabled SPDK_TEST_BLOBFS
test flag in UT job that performs check_so_deps.sh.

Error seen when it is enabled:
there was a dependency mismatch in the library blobfs_bdev
The makefile lists: 'bdev blob_bdev blobfs json jsonrpc log rpc thread util'
readelf outputs   : 'bdev blob_bdev blobfs event json jsonrpc log rpc thread util'

Temporary workarounds have been added, ignoring blobfs_dev
in the abi check test. This will allow for better transition
on CI side. After this patch is merged, UT job flags on CI will be
updated to include SPDK_TEST_BLOBFS and abi reference repository
will be recompiled with this flag.

Next patch in series removes this workaround. It will be merged
after work on CI side is done.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I4753a918d5760f154d4a59349747a0b1356e9c91
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3961


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent e7c92b24

mk/spdk.lib_deps.mk

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ DEPDIRS-blob_bdev := log thread bdev 


# module/blobfs

DEPDIRS-blobfs_bdev := $(BDEV_DEPS_THREAD) blob_bdev blobfs

ifeq ($(CONFIG_FUSE),y)

DEPDIRS-blobfs_bdev += event

endif



# module/accel

DEPDIRS-accel_ioat := log ioat conf thread $(JSON_LIBS) accel util

test/make/check_so_deps.sh

+9 −1
Original line number Diff line number Diff line
@@ -50,6 +50,12 @@ EOF 
			echo "No corresponding object for $so_file in canonical directory. Skipping."

			continue

		fi

		if [ "$so_file" == "libspdk_blobfs_bdev.so" ]; then

			# FIXME: Disable checking for blobfs_bdev.so. Allows updating ABI reference repo

			# without affecting outstanding patches and requiring immediate rebase.

			echo "Checking objects for $so_file temporarily disabled. Skipping."

			continue

		fi



		if ! output=$(abidiff "$source_abi_dir/$so_file" "$libdir/$so_file" --headers-dir1 "$source_abi_dir/../../include/" --headers-dir2 "$rootdir/include" --leaf-changes-only --suppressions $suppression_file --stat); then

			# remove any filtered out variables.
@@ -245,7 +251,9 @@ echo "---------------------------------------------------------------------" 
# users can define their own environment abstraction. However we do want to still check it

# for dependencies to avoid printing out a bunch of confusing symbols under the missing

# symbols section.

SPDK_LIBS=$(ls -1 $libdir/libspdk_*.so | grep -v libspdk_env_dpdk.so)

# FIXME: Disable checking for blobfs_bdev.so. Allows updating ABI reference repo

# without affecting outstanding patches and requiring immediate rebase.

SPDK_LIBS=$(ls -1 $libdir/libspdk_*.so | grep -v libspdk_env_dpdk.so | grep -v blobfs_bdev.so)

DEP_LIBS=$(ls -1 $libdir/libspdk_*.so)



IGNORED_LIBS=()