Jvolivie/client only test

debian/changelog

@@ -1,3 +1,10 @@
+daos (2.7.101-6) unstable; urgency=medium
+  [ Jeff Olivier ]
+  * Remove server build from Ubuntu packaging
+  * Fix client only build
+
+ -- Jeff Olivier <jeffolivier@google.com>  Mon, 10 Mar 2025 13:31:00 +0000
+
 daos (2.7.101-5) unstable; urgency=medium
   [ Jan Michalski ]
   * Add ddb_ut and dtx_ut to the server-tests package

debian/control

@@ -17,18 +17,14 @@ Build-Depends: debhelper (>= 10),
                python3-dev,
                python3-distro,
                libabt-dev (>= 1.2),
-               libpmemobj-dev (>= 2.1.0),
                libfused-dev,
                libprotobuf-c-dev,
                libjson-c-dev,
-               dpdk-dev (>= 21.11.2),
                libisal-crypto-dev,
+               libisal-dev,
                libcunit1-dev,
                golang-go (>= 2:1.21),
                libboost-dev,
-               libspdk-dev (>= 22.01.2),
-               libipmctl-dev,
-               libraft-dev (= 0.11.0-1416.g12dbc15),
                python3-tabulate,
                liblz4-dev,
                libaio-dev,
@@ -141,16 +137,6 @@ Description: This is the package needed to run the DAOS test suite openmpi tools
  .
  This package contains tests
 
-Package: daos-server-tests
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends},
-         daos-server (= ${binary:Version}),
-	 daos-admin (= ${binary:Version})
-Description: This is the package needed to run the DAOS test suite (server tests)
- .
- This package contains tests
-
 Package: daos-client
 Section: net
 Architecture: any
@@ -169,30 +155,11 @@ Description: The Distributed Asynchronous Object Storage (DAOS) is an open-sourc
  This package contains the DAOS client.
 
 
-Package: daos-server
-Section: net
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin, pciutils,
-         ipmctl (>=03.00.00.0468), libfabric (>= 1.15.1-1), spdk-tools (>= 22.01.2)
-Description: The Distributed Asynchronous Object Storage (DAOS) is an open-source
- software-defined object store designed from the ground up for
- massively distributed Non Volatile Memory (NVM). DAOS takes advantage
- of next generation NVM technology like Storage Class Memory (SCM) and
- NVM express (NVMe) while presenting a key-value storage interface and
- providing features such as transactional non-blocking I/O, advanced
- data protection with self healing on top of commodity hardware, end-
- to-end data integrity, fine grained data control and elastic storage
- to optimize performance and cost.
- .
- This package contains the DAOS server.
-
 Package: daos-admin
 Section: net
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends},
-         daos-server (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: The Distributed Asynchronous Object Storage (DAOS) is an open-source
  software-defined object store designed from the ground up for
  massively distributed Non Volatile Memory (NVM). DAOS takes advantage

debian/daos-client-tests.install

@@ -6,6 +6,9 @@ usr/bin/drpc_engine_test
 usr/bin/drpc_test
 usr/bin/dfuse_test
 usr/bin/job_tests
+usr/bin/jump_pl_map
+usr/bin/ring_pl_map
+usr/bin/pl_bench
 usr/bin/eq_tests
 usr/bin/security_test
 usr/bin/fault_status

debian/daos.install

@@ -1,4 +1,3 @@
-usr/bin/daos_metrics
 etc/daos/memcheck-cart.supp
 # Certificate generation files
 usr/lib64/daos/certgen/*

debian/rules

@@ -18,6 +18,7 @@ endif
 SCONS = scons -j $(NUMJOBS)
 DEB_SCONS_OPTIONS := --config=force --no-rpath USE_INSTALLED=all \
                      CONF_DIR=$(sysconfdir)/daos PREFIX=$(prefix) \
+		     client test \
                      $(SCONS_ARGS)
 
 export GOCACHE := $(CURDIR)/.gocache
@@ -51,12 +52,7 @@ override_dh_auto_install:
 	         --install-sandbox=$(CURDIR)/${buildroot} \
 	         $(CURDIR)/${buildroot}${prefix}          \
 	         $(CURDIR)/${buildroot}$(sysconfdir)
-	mkdir -p ${buildroot}$(sysconfdir)/ld.so.conf.d/
-	echo "$(prefix)/lib64/daos_srv" > ${buildroot}$(sysconfdir)/ld.so.conf.d/daos.conf
-	mkdir -p ${buildroot}$(prefix)/lib/sysctl.d
-	install -m 644 utils/rpms/10-daos_server.conf ${buildroot}$(prefix)/lib/sysctl.d
 	mkdir -p ${buildroot}$(prefix)/lib/systemd/system
-	install -m 644 utils/systemd/daos_server.service ${buildroot}$(prefix)/lib/systemd/system
 	install -m 644 utils/systemd/daos_agent.service ${buildroot}$(prefix)/lib/systemd/system
 	mkdir -p ${buildroot}$(sysconfdir)/daos/certs/clients
 	mv ${buildroot}$(sysconfdir)/daos/bash_completion.d ${buildroot}$(sysconfdir)/
@@ -68,8 +64,3 @@ override_dh_missing:
 override_dh_fixperms:
 	dh_fixperms
 	chmod 0700 debian/tmp$(sysconfdir)/daos/certs debian/tmp$(sysconfdir)/daos/certs/clients
-	chmod 0664 debian/tmp$(sysconfdir)/daos/daos_server.yml
-	# set daos_server_helper to be setuid root and group daos_server in order to perform privileged tasks
-	chmod 4750 debian/tmp$(prefix)/bin/daos_server_helper
-	# set daos_server to be setgid daos_server in order to invoke daos_server_helper
-	chmod 2755 debian/tmp$(prefix)/bin/daos_server

site_scons/prereq_tools/base.py

@@ -547,9 +547,9 @@ def __init__(self, env, opts):
     def run_build(self, opts):
         """Build and dependencies"""
         common_reqs = ['ofi', 'hwloc', 'mercury', 'boost', 'uuid', 'crypto', 'protobufc',
-                       'lz4', 'isal', 'isal_crypto']
+                       'lz4', 'isal', 'isal_crypto', 'argobots']
         client_reqs = ['fused', 'json-c', 'capstone', 'aio']
-        server_reqs = ['argobots', 'pmdk', 'spdk', 'ipmctl']
+        server_reqs = ['pmdk', 'spdk', 'ipmctl']
         test_reqs = ['cmocka']
 
         reqs = []

src/common/SConscript

@@ -48,7 +48,6 @@ def scons():
     """Execute build"""
     Import('env', 'base_env', 'prereqs')
 
-    SConscript('dav_v2/SConscript')
     env.AppendUnique(LIBPATH=[Dir('.')])
     base_env.AppendUnique(LIBPATH=[Dir('.')])
     base_env.d_add_build_rpath()
@@ -70,6 +69,7 @@ def scons():
     Export('dc_credit')
 
     if prereqs.server_requested():
+        SConscript('dav_v2/SConscript', exports=['denv'])
         build_daos_common(denv, False)
 
     if not prereqs.test_requested():
@@ -83,11 +83,13 @@ def scons():
 
     tlibenv.Install('$PREFIX/lib64/', tests_lib)
     tenv = denv.Clone()
-    tenv.require('pmdk')
 
-    tenv.Append(CPPDEFINES=['-DDAOS_PMEM_BUILD'])
-    utest_utils = tenv.SharedObject('tests/utest_common.c')
-    Export('utest_utils')
+    if prereqs.server_requested():
+        tenv.require('pmdk')
+
+        tenv.Append(CPPDEFINES=['-DDAOS_PMEM_BUILD'])
+        utest_utils = tenv.SharedObject('tests/utest_common.c')
+        Export('utest_utils')
 
     SConscript('tests/SConscript', exports='tenv')
 

src/common/dav_v2/SConscript

@@ -10,21 +10,22 @@ SRC = ['alloc_class.c', 'bucket.c', 'container_ravl.c', 'container_seglists.c',
 def scons():
     """Scons function"""
 
-    Import('env', 'base_env')
+    Import('denv', 'env', 'base_env')
 
     env.AppendUnique(LIBPATH=[Dir('.')])
+    env.d_add_build_rpath()
     base_env.AppendUnique(LIBPATH=[Dir('.')])
     base_env.d_add_build_rpath()
-    env.d_add_build_rpath()
-
-    denv = env.Clone()
+    denv.AppendUnique(LIBPATH=[Dir('.')])
+    denv.d_add_build_rpath()
 
-    denv.AppendUnique(LIBS=['pthread', 'gurt'])
-    denv.Append(CPPDEFINES=['-DDAOS_PMEM_BUILD', '-DDAV_V2_BUILD'])
-    denv.AppendUnique(CFLAGS=['-fvisibility=hidden'])
+    lenv = denv.Clone()
+    lenv.AppendUnique(LIBS=['pthread', 'gurt'])
+    lenv.Append(CPPDEFINES=['-DDAOS_PMEM_BUILD', '-DDAV_V2_BUILD'])
+    lenv.AppendUnique(CFLAGS=['-fvisibility=hidden'])
 
-    dav_v2 = denv.d_library('dav_v2', SRC)
-    denv.Install('$PREFIX/lib64/', dav_v2)
+    dav_v2 = lenv.d_library('dav_v2', SRC)
+    lenv.Install('$PREFIX/lib64/', dav_v2)
 
 
 if __name__ == "SCons.Script":

src/common/tests/SConscript

@@ -3,26 +3,30 @@
 
 def scons():
     """Execute build"""
-    Import('tenv', 'utest_utils')
+    Import('tenv', 'prereqs')
 
-    tenv.Append(CPPDEFINES=['-DDAOS_PMEM_BUILD'])
     tenv.require('argobots')
+    if prereqs.server_requested():
+        Import('utest_utils')
+        tenv.Append(CPPDEFINES=['-DDAOS_PMEM_BUILD'])
 
-    tenv.d_test_program('btree', ['btree.c', utest_utils],
-                        LIBS=['daos_common_pmem', 'gurt', 'pmemobj', 'cmocka'])
-    tenv.d_test_program('umem_test_bmem', ['umem_test_bmem.c', utest_utils],
-                        LIBS=['daos_common_pmem', 'gurt', 'cmocka'])
-    tenv.d_test_program('umem_test', ['umem_test.c', utest_utils],
-                        LIBS=['daos_common_pmem', 'gurt', 'pmemobj', 'cmocka'])
-    tenv.d_test_program('btree_direct', ['btree_direct.c', utest_utils],
-                        LIBS=['daos_common_pmem', 'gurt', 'pmemobj', 'cmocka'])
-    tenv.d_test_program('other', 'other.c',
-                        LIBS=['daos_common_pmem', 'gurt', 'cart'])
+        tenv.d_test_program('btree', ['btree.c', utest_utils],
+                            LIBS=['daos_common_pmem', 'gurt', 'pmemobj', 'cmocka'])
+        tenv.d_test_program('umem_test_bmem', ['umem_test_bmem.c', utest_utils],
+                            LIBS=['daos_common_pmem', 'gurt', 'cmocka'])
+        tenv.d_test_program('umem_test', ['umem_test.c', utest_utils],
+                            LIBS=['daos_common_pmem', 'gurt', 'pmemobj', 'cmocka'])
+        tenv.d_test_program('btree_direct', ['btree_direct.c', utest_utils],
+                            LIBS=['daos_common_pmem', 'gurt', 'pmemobj', 'cmocka'])
+        tenv.d_test_program('other', 'other.c',
+                            LIBS=['daos_common_pmem', 'gurt', 'cart'])
+        tenv.d_test_program('ad_mem_tests', 'ad_mem_tests.c',
+                            LIBS=['daos_common_pmem', 'gurt', 'cmocka'])
+        tenv.d_test_program('lru', 'lru.c', LIBS=['daos_common_pmem', 'gurt', 'cart'])
     tenv.d_test_program('common_test', ['common_test.c', 'checksum_tests.c',
                                         'compress_tests.c', 'misc_tests.c'],
                         LIBS=['daos_common', 'daos_tests', 'gurt',
                               'cart', 'cmocka'])
-    tenv.d_test_program('lru', 'lru.c', LIBS=['daos_common_pmem', 'gurt', 'cart'])
     tenv.d_test_program('sched', 'sched.c',
                         LIBS=['daos_common', 'gurt', 'cart', 'cmocka', 'pthread'])
     tenv.d_test_program('acl_real_tests', 'acl_util_real_tests.c',
@@ -31,8 +35,6 @@ def scons():
                         LIBS=['daos_common', 'gurt', 'cmocka'])
     tenv.d_test_program('fault_domain_tests', 'fault_domain_tests.c',
                         LIBS=['daos_common', 'gurt', 'cmocka'])
-    tenv.d_test_program('ad_mem_tests', 'ad_mem_tests.c',
-                        LIBS=['daos_common_pmem', 'gurt', 'cmocka'])
     tenv.d_test_program('checksum_timing', 'checksum_timing.c', LIBS=['daos_common', 'gurt'])
     tenv.d_test_program('compress_timing', 'compress_timing.c', LIBS=['daos_common', 'gurt'])
     tenv.d_test_program('rsvc_tests', ['rsvc_tests.c', '../rsvc.c'],

src/security/SConscript

@@ -18,15 +18,13 @@ def scons():
     dc_security_tgts = [sec_obj, auth_obj, acl_obj]
     libdaos_tgts.extend(dc_security_tgts)
 
-    if not prereqs.server_requested():
-        return
-
     senv = denv.Clone()
     senv.require("argobots")
     senv.AppendUnique(LIBS=['gurt'])
     srv_acl_obj = senv.SharedObject('srv_acl.c')
-    ds_sec = senv.d_library('security', ['srv.c', srv_acl_obj, acl_obj], install_off="../..")
-    senv.Install('$PREFIX/lib64/daos_srv', ds_sec)
+    if prereqs.server_requested():
+        ds_sec = senv.d_library('security', ['srv.c', srv_acl_obj, acl_obj], install_off="../..")
+        senv.Install('$PREFIX/lib64/daos_srv', ds_sec)
 
     # pylint: disable-next=unused-variable
     acl_tgts = [auth_obj, srv_acl_obj, acl_obj]