[PATCHES] CTDB cleanups and build restructuring

Martin Schwenke martin at meltin.net
Mon Sep 8 23:59:09 MDT 2014


On Mon, 8 Sep 2014 17:17:54 +1000, Amitay Isaacs <amitay at gmail.com>
wrote:

> On Mon, Sep 8, 2014 at 2:34 PM, Martin Schwenke <martin at meltin.net> wrote:
> 
> > On Fri, 5 Sep 2014 15:53:25 +1000, Martin Schwenke <martin at meltin.net>
> > wrote:
> >
> > > Attached is a series of patches that:
> > >
> > > * Cleans up warnings in the CTDB compile with --enable-developer
> > >
> > > * Changes a small number of functions in CTDB's lib/util to be
> > >   compatible with Samba's lib/util
> > >
> > > * Provides ctdb-util and tdb-wrap build subsystems
> > >
> > > * Does other minor build and packaging tweaks
> > >
> > > After some cleanups and build changes in Samba (coming soon), CTDB can
> > > then easily be:
> > >
> > > 1. Be switched to use Samba's top-level lib/util
> > >
> > > 2. Integrated into the top-level Samba build
> > >
> > > Please review and push if OK.
> > >
> > > These patches are in my ctdb-build branch:
> > >
> > >
> > http://git.samba.org/?p=martins/samba.git;a=shortlog;h=refs/heads/ctdb-build
> >

> Pushed with the minor changes we discussed.

Yesterday's version didn't build with bundled libraries so it failed
autobuild.  The problem occurred when tevent.h wasn't installed in a
known include path.  I had only tested with tevent-dev installed.

Changes:

* UPDATE: ctdb: Mark some functions as static

  Merge 2 patches that mark functions static and add
  ctdb_find_lock_context() to the patch

* ADD: ctdb-logging: Factor out ctdb_logging.h from includes.h

* UPDATE: ctdb-logging: Move variable debug_extra from debug.*

  Move debug_extra to logging.h instead of includes.h

* UPDATE: ctdb-util: Rename db_wrap to tdb_wrap and make it a build
  subsystem

  Don't include includes.h, since this includes tevent.h.  Instead,
  include a limited number of things including ctdb_logging.h

* UPDATE: ctdb-build: Make ctdb-util a wscript build subsystem

  Squash in patch to drop lib/util from includes.  Squash in Amitay's
  fixups to drop lib/util from more places and to avoid duplicate
  deps.

  This patch is now done after tdb_wrap subsystem is created.

* ADD: ctdb-includes: Remove some unnecessary declarations

peace & happiness,
martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ctdb.patches
Type: application/octet-stream
Size: 91426 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140909/49412826/attachment-0001.obj>


More information about the samba-technical mailing list