From 45e61fcf61ed9863fbe2b116fe0763fc139bbe0d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 6 Jan 2012 17:19:54 +0100 Subject: s3: Add a "lock_order" argument to db_open This will be used to enforce a lock hierarchy between the databases. We have seen deadlocks between locking.tdb, brlock.tdb, serverid.tdb and notify*.tdb. These should be fixed by refusing a dbwrap_fetch_locked that does not follow a defined lock hierarchy. --- source3/utils/dbwrap_torture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/utils/dbwrap_torture.c') diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c index 9907f31f76..fb4ed6d4ec 100644 --- a/source3/utils/dbwrap_torture.c +++ b/source3/utils/dbwrap_torture.c @@ -308,7 +308,8 @@ int main(int argc, const char *argv[]) tdb_flags |= TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH; } - db = db_open(mem_ctx, db_name, 0, tdb_flags, O_RDWR | O_CREAT, 0644); + db = db_open(mem_ctx, db_name, 0, tdb_flags, O_RDWR | O_CREAT, 0644, + DBWRAP_LOCK_ORDER_1); if (db == NULL) { d_fprintf(stderr, "failed to open db '%s': %s\n", db_name, -- cgit