diff options
| author | Volker Lendecke <vl@samba.org> | 2012-01-06 17:19:54 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2012-01-18 14:48:04 +0100 |
| commit | 45e61fcf61ed9863fbe2b116fe0763fc139bbe0d (patch) | |
| tree | 06ea9ead2285b4a671d102edb8824422f7325703 /source3/lib/dbwrap/dbwrap_open.h | |
| parent | e75c436fe6a9ee44f6adc744b6269e99f4920431 (diff) | |
| download | samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.tar.gz samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.tar.bz2 samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.zip | |
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.
Diffstat (limited to 'source3/lib/dbwrap/dbwrap_open.h')
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_open.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/lib/dbwrap/dbwrap_open.h b/source3/lib/dbwrap/dbwrap_open.h index 5a172a4a2a..2763ef2ade 100644 --- a/source3/lib/dbwrap/dbwrap_open.h +++ b/source3/lib/dbwrap/dbwrap_open.h @@ -29,6 +29,11 @@ struct db_context; */ bool db_is_local(const char *name); +enum dbwrap_lock_order { + DBWRAP_LOCK_ORDER_1 = 1, + DBWRAP_LOCK_ORDER_2 = 2 +}; + /** * Convenience function that will determine whether to * open a tdb database via the tdb backend or via the ctdb @@ -38,6 +43,7 @@ bool db_is_local(const char *name); struct db_context *db_open(TALLOC_CTX *mem_ctx, const char *name, int hash_size, int tdb_flags, - int open_flags, mode_t mode); + int open_flags, mode_t mode, + enum dbwrap_lock_order lock_order); #endif /* __DBWRAP_OPEN_H__ */ |