debian/changelog

+samba (2:4.9.11+dfsg-2) UNRELEASED; urgency=medium
+
+  * ctdb: enable ceph and etcd recovery lock
+  * Downgrade ctdb_mutex_ceph_rados_helper shlibdeps to recommends
+
+ -- Mathieu Parent <sathieu@debian.org>  Sun, 14 Jul 2019 08:44:39 +0200
+
 samba (2:4.9.11+dfsg-1) unstable; urgency=medium
 
   [ Mathieu Parent ]

debian/control

@@ -38,6 +38,7 @@ Build-Depends: bison,
                libparse-yapp-perl,
                libpcap-dev [hurd-i386 kfreebsd-any],
                libpopt-dev,
+               librados-dev [linux-any],
                libreadline-dev,
                libsystemd-dev [linux-any],
                libtalloc-dev (>= 2.1.14~),
@@ -48,6 +49,7 @@ Build-Depends: bison,
                po-debconf,
                python-all-dev (>= 2.6.6-3),
                python-dnspython,
+               python-etcd,
                python-ldb (>= 2:1.5.1+really1.4.7),
                python-ldb-dev (>= 2:1.5.1+really1.4.7),
                python-talloc-dev (>= 2.1.14~),
@@ -446,7 +448,7 @@ Depends: iproute2 [linux-any],
          time,
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: ethtool [linux-any]
+Recommends: ethtool [linux-any], python-etcd, ${rados:Recommends}
 Suggests: logrotate, lsof
 Description: clustered database to store temporary data
  CTDB is a cluster implementation of the TDB database used by Samba and other

debian/ctdb.install

@@ -11,12 +11,14 @@ usr/bin/ltdbtool
 usr/bin/onnode
 usr/bin/ping_pong
 usr/lib/*/ctdb/ctdb-config
+usr/lib/*/ctdb/ctdb_etcd_lock
 usr/lib/*/ctdb/ctdb-event
 usr/lib/*/ctdb/ctdb-eventd
 usr/lib/*/ctdb/ctdb-path
 usr/lib/*/ctdb/ctdb_killtcp
 usr/lib/*/ctdb/ctdb_lock_helper
 usr/lib/*/ctdb/ctdb_lvs
+[linux-any] usr/lib/*/ctdb/ctdb_mutex_ceph_rados_helper
 usr/lib/*/ctdb/ctdb_mutex_fcntl_helper
 usr/lib/*/ctdb/ctdb_natgw
 usr/lib/*/ctdb/ctdb_recovery_helper
@@ -37,6 +39,8 @@ usr/share/man/man1/ping_pong.1
 usr/share/man/man5/ctdb-script.options.5
 usr/share/man/man5/ctdb.conf.5
 usr/share/man/man5/ctdb.sysconfig.5
+usr/share/man/man7/ctdb-etcd.7
 usr/share/man/man7/ctdb-statistics.7
 usr/share/man/man7/ctdb-tunables.7
+[linux-any] usr/share/man/man7/ctdb_mutex_ceph_rados_helper.7
 usr/share/man/man7/ctdb.7

debian/ctdb.lintian-overrides

+ctdb: python-script-but-no-python-dep usr/lib/*/ctdb/ctdb_etcd_lock #!/usr/bin/python

debian/rules

@@ -69,13 +69,15 @@ conf_args = \
 		--minimum-library-version="$(shell ./debian/autodeps.py --minimum-library-version)" \
 		--with-cluster-support \
 		--with-socketpath=/var/run/ctdb/ctdbd.socket \
-		--with-logdir=/var/log/ctdb
+		--with-logdir=/var/log/ctdb \
+		--enable-etcd-reclock
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	conf_args += \
 		--with-systemd \
 		--systemd-install-services \
-		--with-systemddir=/lib/systemd/system
+		--with-systemddir=/lib/systemd/system \
+		--enable-ceph-reclock
 else
 	conf_args += \
 		--without-systemd
@@ -260,13 +262,16 @@ override_dh_makeshlibs:
 
 override_dh_shlibdeps:
 	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
-	  dh_shlibdeps -a -Xceph.so -Xglusterfs.so -Xsnapper.so
+	  dh_shlibdeps -a -Xceph.so -Xglusterfs.so -Xsnapper.so -Xctdb_mutex_ceph_rados_helper
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
 	  dh_shlibdeps -a -- -pvfsmods -dRecommends \
 	    -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/ceph.so \
 	    -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/glusterfs.so \
 	    -e debian/samba-vfs-modules/usr/lib/*/samba/vfs/snapper.so
+	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
+	  dh_shlibdeps -a -- -prados -dRecommends \
+	    -e debian/ctdb/usr/lib/*/ctdb/ctdb_mutex_ceph_rados_helper
 else
 	LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/samba:$$LD_LIBRARY_PATH \
 	  dh_shlibdeps -a -- -pvfsmods -dRecommends \