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/locking/share_mode_lock.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/locking/share_mode_lock.c')
| -rw-r--r-- | source3/locking/share_mode_lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index 002a399af7..6bc055f70f 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -65,7 +65,8 @@ static bool locking_init_internal(bool read_only) lock_db = db_open(NULL, lock_path("locking.tdb"), lp_open_files_db_hash_size(), TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, - read_only?O_RDONLY:O_RDWR|O_CREAT, 0644); + read_only?O_RDONLY:O_RDWR|O_CREAT, 0644, + DBWRAP_LOCK_ORDER_1); if (!lock_db) { DEBUG(0,("ERROR: Failed to initialise locking database\n")); |