xlators/experimental: remove from the build

Based on the proposal to remove few features as they are not
actively maintained [1], removing all experimental translators
from the build.

[1] https://lists.gluster.org/pipermail/gluster-users/2018-July/034400.html

Note that as followup patch, there would be a patch to remove the code.

Updates: bz#1635688
Change-Id: I8ebc256517feb37fc7580104e8bebe27d047f959
Signed-off-by: Amar Tumballi <amarts@redhat.com>

3 files changed, 2 insertions, 54 deletions

diff --git a/configure.ac b/configure.ac
index 2d424cf6aec..fbdc2f2064b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,8 +121,6 @@ AC_CONFIG_FILES([Makefile
                 xlators/features/arbiter/src/Makefile
                 xlators/features/thin-arbiter/Makefile
                 xlators/features/thin-arbiter/src/Makefile
-                xlators/experimental/fdl/Makefile
-                xlators/experimental/fdl/src/Makefile
                 xlators/features/changelog/Makefile
                 xlators/features/changelog/src/Makefile
                 xlators/features/changelog/lib/Makefile
@@ -198,23 +196,6 @@ AC_CONFIG_FILES([Makefile
                 xlators/mgmt/Makefile
                 xlators/mgmt/glusterd/Makefile
                 xlators/mgmt/glusterd/src/Makefile
-                xlators/experimental/Makefile
-                xlators/experimental/jbr-client/Makefile
-                xlators/experimental/jbr-client/src/Makefile
-                xlators/experimental/jbr-server/Makefile
-                xlators/experimental/jbr-server/src/Makefile
-                xlators/experimental/dht2/Makefile
-                xlators/experimental/dht2/dht2-client/Makefile
-                xlators/experimental/dht2/dht2-client/src/Makefile
-                xlators/experimental/dht2/dht2-server/Makefile
-                xlators/experimental/dht2/dht2-server/src/Makefile
-                xlators/experimental/posix2/Makefile
-                xlators/experimental/posix2/ds/Makefile
-                xlators/experimental/posix2/ds/src/Makefile
-                xlators/experimental/posix2/mds/Makefile
-                xlators/experimental/posix2/mds/src/Makefile
-                xlators/experimental/posix2/common/Makefile
-                xlators/experimental/posix2/common/src/Makefile
                 cli/Makefile
                 cli/src/Makefile
                 doc/Makefile
@@ -1506,18 +1487,6 @@ AC_SUBST(UNITTEST_LDFLAGS)
 AC_SUBST(CFLAGS)
 # end enable debug section
 
-# experimental section
-AC_ARG_ENABLE([experimental],
-              AC_HELP_STRING([--disable-experimental],
-                             [Disable building experimental xlators]))
-
-BUILD_EXPERIMENTAL="yes"
-if test "x$enable_experimental" = "xno"; then
-  BUILD_EXPERIMENTAL="no"
-fi
-AM_CONDITIONAL([ENABLE_EXPERIMENTAL], [test x$BUILD_EXPERIMENTAL = xyes])
-#end experimental section
-
 # EC dynamic code generation section
 
 EC_DYNAMIC_SUPPORT="none"
@@ -1719,7 +1688,6 @@ echo "Track priv ports     : $TRACK_PRIVPORTS"
 echo "POSIX ACLs           : $BUILD_POSIX_ACLS"
 echo "SELinux features     : $USE_SELINUX"
 echo "firewalld-config     : $BUILD_FIREWALLD"
-echo "Experimental xlators : $BUILD_EXPERIMENTAL"
 echo "Events               : $BUILD_EVENTS"
 echo "EC dynamic support   : $EC_DYNAMIC_SUPPORT"
 echo "Use memory pools     : $USE_MEMPOOL"
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 48594422be0..98fdd77df93 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -1053,10 +1053,6 @@ exit 0
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/nl-cache.so
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
-%if 0%{?!_without_server:1}
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/fdl.so
-%endif
 %dir %attr(0775,gluster,gluster) %{_rundir}/gluster
 %if 0%{?_tmpfilesdir:1} && 0%{!?_without_server:1}
 %{_tmpfilesdir}/gluster.conf
@@ -1109,8 +1105,6 @@ exit 0
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2c.so
 
 %files extra-xlators
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
@@ -1275,7 +1269,6 @@ exit 0
 %{_mandir}/man8/gluster-setgfid2path.8*
 
 # xlators
-     %{_libdir}/libposix2common.so
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
@@ -1304,12 +1297,6 @@ exit 0
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/jbrc.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/jbr.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2s.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/posix2-ds.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/posix2-mds.so
 
 # snap_scheduler
 %{_sbindir}/snap_scheduler.py
@@ -1396,9 +1383,6 @@ exit 0
 %if ( 0%{?_with_firewalld:1} )
 %{_prefix}/lib/firewalld/services/glusterfs.xml
 %endif
-
-%{_sbindir}/gf_logdump
-%{_sbindir}/gf_recon
 # end of server files
 %endif
 
diff --git a/xlators/Makefile.am b/xlators/Makefile.am
index 876a31f8e81..29549db724e 100644
--- a/xlators/Makefile.am
+++ b/xlators/Makefile.am
@@ -1,16 +1,12 @@
-if ENABLE_EXPERIMENTAL
-  EXPERIMENTAL = experimental
-endif
-
 if BUILD_GNFS
   GNFS_DIR = nfs
 endif
 
 DIST_SUBDIRS = cluster storage protocol performance debug features encryption \
-          mount nfs mgmt system playground meta experimental
+          mount nfs mgmt system playground meta
 
 SUBDIRS = cluster storage protocol performance debug features encryption \
-          mount ${GNFS_DIR} mgmt system playground meta $(EXPERIMENTAL)
+          mount ${GNFS_DIR} mgmt system playground meta
 
 EXTRA_DIST = xlator.sym