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/utils/status.c | |
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/utils/status.c')
-rw-r--r-- | source3/utils/status.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/utils/status.c b/source3/utils/status.c index 8ae8de76a3..8f8f3945cb 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -455,7 +455,8 @@ static int traverse_sessionid(const char *key, struct sessionid *session, int result; struct db_context *db; db = db_open(NULL, lock_path("locking.tdb"), 0, - TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDONLY, 0); + TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDONLY, 0, + DBWRAP_LOCK_ORDER_1); if (!db) { d_printf("%s not initialised\n", |