From a907e468e724c32b9833ce59806fc215c7122d63 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Fri, 10 Aug 2018 15:57:50 +0530 Subject: bd: remove from the build Based on the proposal to remove few features as they are not actively maintained [1], removed BD (block device) translator from the build. [1] - https://lists.gluster.org/pipermail/gluster-users/2018-July/034400.html Updates: bz#1635688 Change-Id: Ia96db406c58a7aef355dde6bc33523bb2492b1a9 Signed-off-by: Amar Tumballi --- configure.ac | 40 ---------- glusterfs.spec.in | 7 -- tests/basic/bd.t | 142 ---------------------------------- xlators/mgmt/glusterd/src/Makefile.am | 3 - xlators/storage/Makefile.am | 4 - 5 files changed, 196 deletions(-) delete mode 100755 tests/basic/bd.t diff --git a/configure.ac b/configure.ac index 3f693855840..01250825b7b 100644 --- a/configure.ac +++ b/configure.ac @@ -63,8 +63,6 @@ AC_CONFIG_FILES([Makefile xlators/storage/Makefile xlators/storage/posix/Makefile xlators/storage/posix/src/Makefile - xlators/storage/bd/Makefile - xlators/storage/bd/src/Makefile xlators/cluster/Makefile xlators/cluster/afr/Makefile xlators/cluster/afr/src/Makefile @@ -663,43 +661,6 @@ if test "x$enable_fuse_client" != "xno"; then BUILD_FUSE_CLIENT="yes" fi -AC_ARG_ENABLE([bd-xlator], - AC_HELP_STRING([--enable-bd-xlator], [Build BD xlator])) - -if test "x${with_server}" = "xyes" -a "x$enable_bd_xlator" != "xno"; then - AC_CHECK_LIB([lvm2app], - [lvm_init,lvm_lv_from_name], - [HAVE_BD_LIB="yes"], - [HAVE_BD_LIB="no"]) - -if test "x$HAVE_BD_LIB" = "xyes"; then - # lvm_lv_from_name() has been made public with lvm2-2.02.79 - AC_CHECK_DECLS( - [lvm_lv_from_name], - [NEED_LVM_LV_FROM_NAME_DECL="no"], - [NEED_LVM_LV_FROM_NAME_DECL="yes"], - [[#include ]]) - fi -fi - -if test "x$enable_bd_xlator" = "xyes" -a "x$HAVE_BD_LIB" = "xno"; then - echo "BD xlator requested but required lvm2 development library not found." - exit 1 -fi - -BUILD_BD_XLATOR=no -if test "x${enable-bd-xlator}" != "xno" -a "x${HAVE_BD_LIB}" = "xyes"; then - BUILD_BD_XLATOR=yes - AC_DEFINE(HAVE_BD_XLATOR, 1, [define if lvm2app library found and bd xlator - enabled]) - if test "x$NEED_LVM_LV_FROM_NAME_DECL" = "xyes"; then - AC_DEFINE(NEED_LVM_LV_FROM_NAME_DECL, 1, [defined if lvm_lv_from_name() - was not found in the lvm2app.h header, but can be linked]) - fi -fi - -AM_CONDITIONAL([ENABLE_BD_XLATOR], [test x$BUILD_BD_XLATOR = xyes]) - AC_CHECK_LIB([ssl], TLS_method, [HAVE_OPENSSL_1_1="yes"], [HAVE_OPENSSL_1_1="no"]) if test "x$HAVE_OPENSSL_1_1" = "xyes"; then AC_DEFINE([HAVE_TLS_METHOD], [1], [Using OpenSSL-1.1 TLS_method]) @@ -1636,7 +1597,6 @@ echo "georeplication : $BUILD_SYNCDAEMON" echo "Linux-AIO : $BUILD_LIBAIO" echo "Enable Debug : $BUILD_DEBUG" echo "Enable ASAN : $BUILD_ASAN" -echo "Block Device xlator : $BUILD_BD_XLATOR" echo "Use syslog : $USE_SYSLOG" echo "XML output : $BUILD_XML_OUTPUT" echo "Encryption xlator : $BUILD_CRYPT_XLATOR" diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 1bec9677c92..81fef8e9ac0 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -270,9 +270,6 @@ BuildRequires: libuuid-devel %if ( 0%{?_with_cmocka:1} ) BuildRequires: libcmocka-devel >= 1.0.1 %endif -%if ( 0%{!?_without_bd:1} ) -BuildRequires: lvm2-devel -%endif %if ( 0%{!?_without_georeplication:1} ) BuildRequires: libattr-devel %endif @@ -688,7 +685,6 @@ done %{?_with_gnfs} \ %{?_with_tmpfilesdir} \ %{?_with_valgrind} \ - %{?_without_bd} \ %{?_without_epoll} \ %{?_without_events} \ %{?_without_fusermount} \ @@ -1265,9 +1261,6 @@ exit 0 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage -%if ( 0%{!?_without_bd:1} ) - %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/bd.so -%endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so diff --git a/tests/basic/bd.t b/tests/basic/bd.t deleted file mode 100755 index 63622edd709..00000000000 --- a/tests/basic/bd.t +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../include.rc -. $(dirname $0)/../volume.rc - -function execute() -{ - cmd=$1 - shift - ${cmd} $@ >/dev/null 2>&1 -} - -function bd_cleanup() -{ - execute vgremove -f ${V0} - execute pvremove ${ld} - execute losetup -d ${ld} - execute rm ${BD_DISK} - cleanup -} - -function check() -{ - if [ $? -ne 0 ]; then - echo prerequsite $@ failed - bd_cleanup - exit - fi -} - -SIZE=256 #in MB - -bd_cleanup; - -## Configure environment needed for BD backend volumes -## Create a file with configured size and -## set it as a temporary loop device to create -## physical volume & VG. These are basic things needed -## for testing BD xlator if anyone of these steps fail, -## test script exits -function configure() -{ - GLDIR=`$CLI system:: getwd` - BD_DISK=${GLDIR}/bd_disk - - execute truncate -s${SIZE}M ${BD_DISK} - check ${BD_DISK} creation - - execute losetup -f - check losetup - ld=`losetup -f` - - execute losetup ${ld} ${BD_DISK} - check losetup ${BD_DISK} - execute pvcreate -f ${ld} - check pvcreate ${ld} - execute vgcreate ${V0} ${ld} - check vgcreate ${V0} - execute lvcreate --thin ${V0}/pool --size 128M -} - -function volinfo_field() -{ - local vol=$1; - local field=$2; - $CLI volume info $vol | grep "^$field: " | sed 's/.*: //'; -} - -function volume_type() -{ - getfattr -n volume.type $M0/. --only-values --absolute-names -e text -} - -case $OSTYPE in -NetBSD) - echo "Skip test on LVM which is not available on NetBSD" >&2 - SKIP_TESTS - exit 0 - ;; -*) - ;; -esac - -TEST glusterd -TEST pidof glusterd -configure - -TEST $CLI volume create $V0 ${H0}:/$B0/$V0?${V0} -EXPECT "$V0" volinfo_field $V0 'Volume Name'; -EXPECT 'Created' volinfo_field $V0 'Status'; - -## Start volume and verify -TEST $CLI volume start $V0; -EXPECT 'Started' volinfo_field $V0 'Status' - -TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0; -EXPECT '1' volume_type - -## Create posix file -TEST touch $M0/posix - -TEST touch $M0/lv -gfid=`getfattr -n glusterfs.gfid.string $M0/lv --only-values --absolute-names` -TEST setfattr -n user.glusterfs.bd -v "lv:4MB" $M0/lv -# Check if LV is created -TEST stat /dev/$V0/${gfid} - -## Create filesystem -sleep 1 -TEST mkfs.ext4 -qF $M0/lv -# Cloning -TEST touch $M0/lv_clone -gfid=`getfattr -n glusterfs.gfid.string $M0/lv_clone --only-values --absolute-names` -TEST setfattr -n clone -v ${gfid} $M0/lv -TEST stat /dev/$V0/${gfid} - -sleep 1 -## Check mounting -TEST mount -o loop $M0/lv $M1 -EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M1 - -# Snapshot -TEST touch $M0/lv_sn -gfid=`getfattr -n glusterfs.gfid.string $M0/lv_sn --only-values --absolute-names` -TEST setfattr -n snapshot -v ${gfid} $M0/lv -TEST stat /dev/$V0/${gfid} - -# Merge -sleep 1 -TEST setfattr -n merge -v "$M0/lv_sn" $M0/lv_sn -TEST ! stat $M0/lv_sn -TEST ! stat /dev/$V0/${gfid} - - -rm $M0/* -f - -EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 -TEST $CLI volume stop ${V0} -EXPECT 'Stopped' volinfo_field $V0 'Status'; -TEST $CLI volume delete ${V0} - -bd_cleanup diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index aa75344d1ac..6d09e37477c 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -30,9 +30,6 @@ glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ $(top_builddir)/rpc/xdr/src/libgfxdr.la \ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ $(XML_LIBS) -lcrypto $(URCU_LIBS) $(URCU_CDS_LIBS) -if ENABLE_BD_XLATOR -glusterd_la_LIBADD += -llvm2app -endif noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \ glusterd-sm.h glusterd-store.h glusterd-mem-types.h \ diff --git a/xlators/storage/Makefile.am b/xlators/storage/Makefile.am index c08e8e41bca..5e3ed0eb93b 100644 --- a/xlators/storage/Makefile.am +++ b/xlators/storage/Makefile.am @@ -1,7 +1,3 @@ SUBDIRS = posix -if ENABLE_BD_XLATOR -SUBDIRS += bd -endif - CLEANFILES = -- cgit