DAOS-15136 client: Switch to using libfused

debian/changelog

@@ -1,4 +1,10 @@
-daos (2.5.101-4) unstable; urgency=medium
+daos (2.5.101-5) unstable; urgency=medium
+  [ Jeff Olivier ]
+  * Switch from libfuse3 to libfused
+
+ -- Jeff Olivier <[email protected]>  Thu, 25 Apr 2024 10:30:00 +0000
+
+daos (2.5.101-5) unstable; urgency=medium
   [ Fan Yong ]
   * NOOP change to keep in parity with RPM version
 

debian/control

@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 10),
                libabt-dev,
                libucx-dev,
                libpmemobj-dev (>= 2.0.0),
-               libfuse3-dev,
+               libfused-dev,
                libprotobuf-c-dev,
                libjson-c-dev,
                dpdk-dev (>= 21.11.2),

site_scons/components/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2023 Intel Corporation
+# Copyright 2016-2024 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -308,6 +308,18 @@ def define_components(reqs):
                 required_progs=['libtoolize', 'ninja', 'meson'],
                 out_of_src_build=True)
 
+    reqs.define('fused', libs=['fused'], defines=['FUSE_USE_VERSION=35'],
+                retriever=GitRepoRetriever('https://github.com/daos-stack/fused.git'),
+                commands=[['find', '../fused', '-type', 'f', '-name', '*', '-exec', 'sed', '-i',
+                           's/fuse3/fused/g', '{}', ';'],
+                          ['meson', 'setup', '--prefix=$FUSED_PREFIX', '-Ddisable-mtab=True',
+                           '-Dudevrulesdir=$FUSED_PREFIX/udev', '-Dutils=False',
+                           '--default-library', 'shared', '../fused'],
+                          ['ninja', 'install']],
+                headers=['fused/fuse.h'],
+                required_progs=['libtoolize', 'ninja', 'meson'],
+                out_of_src_build=True)
+
     # Tell SPDK which CPU to optimize for, by default this is native which works well unless you
     # are relocating binaries across systems, for example in CI under GitHub actions etc.  There
     # isn't a minimum value needed here, but getting this wrong will cause daos server to exit

site_scons/prereq_tools/base.py

@@ -444,7 +444,6 @@ def __init__(self, env, opts):
         opts.Add(('MPI_PKG', 'Specifies name of pkg-config to load for MPI', None))
         opts.Add(BoolVariable('FIRMWARE_MGMT', 'Build in device firmware management.', False))
         opts.Add(BoolVariable('STACK_MMAP', 'Allocate ABT ULTs stacks with mmap()', False))
-        opts.Add(BoolVariable('STATIC_FUSE', "Build with static libfuse library", False))
         opts.Add(EnumVariable('BUILD_TYPE', "Set the build type", 'release',
                               ['dev', 'debug', 'release'], ignorecase=1))
         opts.Add(EnumVariable('TARGET_TYPE', "Set the prerequisite type", 'default',
@@ -521,7 +520,7 @@ def run_build(self, opts):
         # argobots is not really needed by client but it's difficult to separate
         common_reqs = ['ucx', 'ofi', 'hwloc', 'mercury', 'boost', 'uuid', 'crypto', 'protobufc',
                        'lz4', 'isal', 'isal_crypto']
-        client_reqs = ['fuse', 'json-c', 'capstone']
+        client_reqs = ['fused', 'json-c', 'capstone']
         server_reqs = ['argobots', 'pmdk', 'spdk', 'ipmctl']
         test_reqs = ['cmocka']
 

src/client/dfuse/SConscript

@@ -140,7 +140,7 @@ def check_ioctl_def(context, ctype):
     context.Message(f'Checking if fuse ioctl is type {ctype} ')
 
     # pylint: disable-next=consider-using-f-string
-    src = """#include <fuse3/fuse_lowlevel.h>
+    src = """#include <fused/fuse_lowlevel.h>
 
 extern void
 my_ioctl (fuse_req_t req, fuse_ino_t ino, %s cmd,
@@ -175,22 +175,6 @@ def configure_fuse(cenv):
     check.Finish()
 
 
-def find_static_fuse(cenv):
-    """Find and copy static fuse library"""
-
-    fuse_prefix = '/usr'
-    if os.path.exists(cenv.subst('$FUSE_PREFIX')):
-        fuse_prefix = cenv.subst('$FUSE_PREFIX')
-
-    for path in ['lib64', 'lib/x86_64-linux-gnu', 'lib']:
-        fuselib = os.path.join(fuse_prefix, path, "libfuse3.a")
-        if os.path.exists(fuselib):
-            return [File(fuselib)]
-
-    print("Could not find libfuse3.a")
-    return []
-
-
 def scons():
     """Scons function"""
 
@@ -229,14 +213,8 @@ def scons():
     cenv.AppendUnique(LIBS=['dfs', 'duns'])
 
     cenv.require('hwloc')
-    if cenv.get('STATIC_FUSE'):
-        cenv.require('fuse', headers_only=True)
-        static_fuse = find_static_fuse(cenv)
-        extra_libs = ['dl']
-    else:
-        cenv.require('fuse')
-        static_fuse = []
-        extra_libs = ['dl']
+    cenv.require('fused')
+    extra_libs = ['dl']
 
     configure_fuse(cenv)
 
@@ -246,7 +224,7 @@ def scons():
     for src in OPS_SRC:
         dfuse_obj += cenv.Object(os.path.join('ops', f'{src}.c'))
     cenv.AppendUnique(LIBS=['gurt'] + extra_libs)
-    dfuse_bin = cenv.d_program('dfuse/dfuse', common + dfuse_obj + static_fuse)
+    dfuse_bin = cenv.d_program('dfuse/dfuse', common + dfuse_obj)
 
     Default(dfuse_bin)
 

src/client/dfuse/dfuse.h

@@ -9,8 +9,8 @@
 
 #include <semaphore.h>
 
-#include <fuse3/fuse.h>
-#include <fuse3/fuse_lowlevel.h>
+#include <fused/fuse.h>
+#include <fused/fuse_lowlevel.h>
 
 #include <gurt/list.h>
 #include <gurt/hash.h>

src/client/dfuse/dfuse_core.c

@@ -1517,6 +1517,8 @@ dfuse_fs_start(struct dfuse_info *dfuse_info, struct dfuse_cont *dfs)
 	}
 
 err_threads:
+	dfuse_info->di_shutdown = true;
+
 	for (int i = 0; i < dfuse_info->di_eq_count; i++) {
 		struct dfuse_eq *eqt = &dfuse_info->di_eqt[i];
 

src/client/dfuse/dfuse_fuseops.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
 
-#include <fuse3/fuse_lowlevel.h>
+#include <fused/fuse_lowlevel.h>
 
 #include "dfuse_common.h"
 #include "dfuse.h"

src/client/dfuse/dfuse_main.c

@@ -8,8 +8,8 @@
 #include <getopt.h>
 #include <dlfcn.h>
 #include <fcntl.h>
-#include <fuse3/fuse.h>
-#include <fuse3/fuse_lowlevel.h>
+#include <fused/fuse.h>
+#include <fused/fuse_lowlevel.h>
 #include <string.h>
 
 #include <sys/types.h>

src/client/dfuse/dfuse_thread.c

@@ -6,7 +6,7 @@
 
 #include <pthread.h>
 
-#include <fuse3/fuse_lowlevel.h>
+#include <fused/fuse_lowlevel.h>
 #define D_LOGFAC DD_FAC(dfuse)
 #include "dfuse.h"
 

utils/build.config

@@ -3,7 +3,7 @@ component=daos
 
 [commit_versions]
 ARGOBOTS = v1.1
-FUSE = fuse-3.16.2
+FUSED = master
 PMDK = 2.0.0
 ISAL = v2.30.0
 ISAL_CRYPTO = v2.23.0
@@ -17,4 +17,3 @@ UCX=v1.14.1
 spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff
 ofi=https://github.com/ofiwg/libfabric/commit/d827c6484cc5bf67dfbe395890e258860c3f0979.diff
 mercury=https://raw.githubusercontent.com/daos-stack/mercury/857f1d5d2ca72d4c1b8d7be5e7fd26d6292b495f/na_ucx_am_send_retry.patch,https://github.com/mercury-hpc/mercury/commit/b8c26fd86281f3b0883c31bd2d0cb467a12b860d.diff,https://github.com/mercury-hpc/mercury/commit/a35589c3d1134d9c80640e78247e210162ac4a3c.diff,https://github.com/mercury-hpc/mercury/commit/fa4abbb6273d975b2ef17ac4e561fd4255d384db.diff
-fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff

utils/node_local_test.py

@@ -6502,7 +6502,7 @@ def main():
     parser.add_argument('--dfuse-debug', default=None)
     parser.add_argument('--client-debug', default=None)
     parser.add_argument('--class-name', default=None, help='class name to use for junit')
-    parser.add_argument('--memcheck', default='some', choices=['yes', 'no', 'some'])
+    parser.add_argument('--memcheck', default='no', choices=['yes', 'no', 'some'])
     parser.add_argument('--server-valgrind', action='store_true')
     parser.add_argument('--server-fi', action='store_true', help='Run server fault injection test')
     parser.add_argument('--multi-user', action='store_true')

utils/rpms/daos.spec

@@ -15,7 +15,7 @@
 
 Name:          daos
 Version:       2.5.101
-Release:       4%{?relval}%{?dist}
+Release:       5%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
 License:       BSD-2-Clause-Patent
@@ -51,9 +51,9 @@ BuildRequires: boost-devel
 %endif
 BuildRequires: libpmemobj-devel >= 2.0.0
 %if (0%{?rhel} >= 8)
-BuildRequires: fuse3-devel >= 3
+BuildRequires: fused-devel >= 1
 %else
-BuildRequires: fuse3-devel >= 3.4.2
+BuildRequires: fused-devel >= 1
 %endif
 %if (0%{?suse_version} >= 1500)
 BuildRequires: go-race
@@ -175,7 +175,7 @@ Requires: mercury >= %{mercury_version}
 Requires: libfabric >= %{libfabric_version}
 %if (0%{?suse_version} >= 1500)
 Requires: libfabric1 >= %{libfabric_version}
-Requires: libfuse3-3 >= 3.4.2
+Requires: fused >= 1
 %endif
 Requires: /usr/bin/fusermount3
 %{?systemd_requires}
@@ -223,11 +223,7 @@ Requires: libcapstone-devel
 Requires: Lmod
 Requires: capstone-devel
 %endif
-%if (0%{?rhel} >= 8)
-Requires: fuse3-devel >= 3
-%else
-Requires: fuse3-devel >= 3.4.2
-%endif
+Requires: fused >= 1
 
 %description client-tests
 This is the package needed to run the DAOS test suite (client tests)
@@ -587,6 +583,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 # No files in a shim package
 
 %changelog
+* Thu Apr 25 2024 Jeff Olivier <[email protected]> 2.5.101-5
+- Switch libfuse3 to libfused
+
 * Fri Apr 05 2024 Fan Yong <[email protected]> 2.5.101-4
 - Catastrophic Recovery