Hi folks, I am currently working on adding ctdb and clustered samba build to selftest and autobuild.
I have added a ctdb snapshot of current ctdb master into the master branch. I can build ctdb and samba with cluster support. Now I am working on adding a clusteredmember target to Samba3. Eventually, I think we should add ctdb master with full history to samba master and change to developing it here. But for a start/poc, I'll just add a snapshot, see: http://gitweb.samba.org/?p=obnox/samba/samba-obnox.git;a=shortlog;h=refs/heads/master-ctdbtest Cheers - Michael Michael Adam wrote: > The branch, master has been updated > via 71f5f41 s3:dbwrap_ctdb: fix the build after changing signature of > tdb_wrap_open() > from e287a72 add lib/param files to .gitignore > > http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master > > > - Log ----------------------------------------------------------------- > commit 71f5f41860e678e6151b969a05729ccf2d738e35 > Author: Michael Adam <ob...@samba.org> > Date: Thu Oct 13 16:50:57 2011 +0200 > > s3:dbwrap_ctdb: fix the build after changing signature of tdb_wrap_open() > > Autobuild-User: Michael Adam <ob...@samba.org> > Autobuild-Date: Thu Oct 13 18:50:47 CEST 2011 on sn-devel-104 > > ----------------------------------------------------------------------- > > Summary of changes: > source3/lib/dbwrap/dbwrap_ctdb.c | 8 +++++++- > 1 files changed, 7 insertions(+), 1 deletions(-) > > > Changeset truncated at 500 lines: > > diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c > b/source3/lib/dbwrap/dbwrap_ctdb.c > index 4c5cd64..e0f98cc 100644 > --- a/source3/lib/dbwrap/dbwrap_ctdb.c > +++ b/source3/lib/dbwrap/dbwrap_ctdb.c > @@ -23,6 +23,7 @@ > #include "lib/util/tdb_wrap.h" > #include "util_tdb.h" > #include "dbwrap/dbwrap_rbt.h" > +#include "lib/param/param.h" > > #ifdef CLUSTER_SUPPORT > > @@ -1428,6 +1429,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, > struct db_ctdb_ctx *db_ctdb; > char *db_path; > struct ctdbd_connection *conn; > + struct loadparm_context *lp_ctx; > > if (!lp_clustering()) { > DEBUG(10, ("Clustering disabled -- no ctdb\n")); > @@ -1474,7 +1476,11 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, > chmod(db_path, mode); > } > > - db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, tdb_flags, > O_RDWR, 0); > + lp_ctx = loadparm_init_s3(db_path, loadparm_s3_context()); > + > + db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, tdb_flags, > + O_RDWR, 0, lp_ctx); > + talloc_unlink(db_path, lp_ctx); > if (db_ctdb->wtdb == NULL) { > DEBUG(0, ("Could not open tdb %s: %s\n", db_path, > strerror(errno))); > TALLOC_FREE(result); > > > -- > Samba Shared Repository
pgpdYZ8iYKSUo.pgp
Description: PGP signature