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/registry | |
| 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/registry')
| -rw-r--r-- | source3/registry/reg_backend_db.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index 378b20fc26..0245f4ca10 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -727,10 +727,12 @@ WERROR regdb_init(void) } regdb = db_open(NULL, state_path("registry.tdb"), 0, - REG_TDB_FLAGS, O_RDWR, 0600); + REG_TDB_FLAGS, O_RDWR, 0600, + DBWRAP_LOCK_ORDER_1); if (!regdb) { regdb = db_open(NULL, state_path("registry.tdb"), 0, - REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600); + REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600, + DBWRAP_LOCK_ORDER_1); if (!regdb) { werr = ntstatus_to_werror(map_nt_error_from_unix(errno)); DEBUG(1,("regdb_init: Failed to open registry %s (%s)\n", @@ -844,7 +846,8 @@ WERROR regdb_open( void ) become_root(); regdb = db_open(NULL, state_path("registry.tdb"), 0, - REG_TDB_FLAGS, O_RDWR, 0600); + REG_TDB_FLAGS, O_RDWR, 0600, + DBWRAP_LOCK_ORDER_1); if ( !regdb ) { result = ntstatus_to_werror( map_nt_error_from_unix( errno ) ); DEBUG(0,("regdb_open: Failed to open %s! (%s)\n", |