[PATCH v4] fix ctdb_mutex_ceph_rados_helper deadlock

[David Disseldorp]

On Thu, 2 Aug 2018 16:34:43 +1000, Amitay Isaacs via samba-technical wrote:
...
> > Additional team review / push appreciated.  
> 
> The first patch breaks the standalone CTDB build.  Here is a fixup
> patch that you can squash with your first patch.
> 
> I have tested with distro based (fedora 28) ceph/rados packages.  I
> haven't built ceph from source.
> 
> With this fixup, reviewed by me.

Thanks a lot for the review. Looks like there's one last change that's
needed to handle standalone build with --with-libcephfs=<path>, as we
can't rely on the source3/wscript env:

--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -243,8 +243,12 @@ def configure(conf):
     if Options.options.ctdb_ceph_reclock:
         # Use custom libcephfs library path if provided
         if Options.options.libcephfs_dir:
-            conf.env['CPPPATH_RADOS'] = conf.env['CPPPATH_CEPHFS']
-            conf.env['LIBPATH_RADOS'] = conf.env['LIBPATH_CEPHFS']
+            conf.env['CPPPATH_RADOS'] = Options.options.libcephfs_dir + '/include'
+            conf.env['LIBPATH_RADOS'] = Options.options.libcephfs_dir + '/lib'
+            conf.env['LIBPATH_CEPH-COMMON'] = conf.env['LIBPATH_RADOS'] + '/ceph'
+        else:
+            conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph'

I've squashed this in along with your change, and added your RB tag to
all other commits. Please push if you're okay with attached.

Cheers, David
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bso13540_fix_ctdb_ceph_reclock_deadlock_v4.patchset
Type: text/x-patch
Size: 24302 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20180802/8ff2aba7/bso13540_fix_ctdb_ceph_reclock_deadlock_v4.bin>