sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r25690: - only use a readonly traverse in ldb_search when not in a transaction. When we are in a transaction then we could be in a top level modify operation (such as rename), so we must use a writeable traverse so that the async callbacks can do the modifies while the search is progressing.

Browse Source 
- don't do the lockall operation on the tdb during a ldb search if in
  a transaction, as this would prevent modifies by callbacks as well
This commit is contained in:
Andrew Tridgell 2007-10-18 02:03:21 +02:00 committed by Stefan Metzmacher
parent 2a6713aa23
commit aa9ab431e0
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/lib/ldb/ldb_tdb/ldb_search.c
View File

@ -253,7 +253,10 @@ int ltdb_search_dn1(struct ldb_module *module, struct ldb_dn *dn, struct ldb_mes
static int ltdb_lock_read(struct ldb_module *module)
{
struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
return tdb_lockall_read(ltdb->tdb);
if (ltdb->in_transaction == 0) {
return tdb_lockall_read(ltdb->tdb);
}
return 0;
}
/*
@ -262,7 +265,10 @@ static int ltdb_lock_read(struct ldb_module *module)
static int ltdb_unlock_read(struct ldb_module *module)
{
struct ltdb_private *ltdb = (struct ltdb_private *)module->private_data;
return tdb_unlockall_read(ltdb->tdb);
if (ltdb->in_transaction == 0) {
return tdb_unlockall_read(ltdb->tdb);
}
return 0;
}
/*
@ -442,7 +448,11 @@ static int ltdb_search_full(struct ldb_handle *handle)
struct ltdb_private *ltdb = talloc_get_type(ac->module->private_data, struct ltdb_private);
int ret;
ret = tdb_traverse_read(ltdb->tdb, search_func, handle);
if (ltdb->in_transaction != 0) {
ret = tdb_traverse(ltdb->tdb, search_func, handle);
} else {
ret = tdb_traverse_read(ltdb->tdb, search_func, handle);
}
if (ret == -1) {
handle->status = LDB_ERR_OPERATIONS_ERROR;

6
source/lib/ldb/ldb_tdb/ldb_tdb.c
View File

@ -907,6 +907,8 @@ static int ltdb_start_trans(struct ldb_module *module)
return ltdb_err_map(tdb_error(ltdb->tdb));
}
ltdb->in_transaction++;
return LDB_SUCCESS;
}
@ -915,6 +917,8 @@ static int ltdb_end_trans(struct ldb_module *module)
struct ltdb_private *ltdb =
talloc_get_type(module->private_data, struct ltdb_private);
ltdb->in_transaction--;
if (tdb_transaction_commit(ltdb->tdb) != 0) {
return ltdb_err_map(tdb_error(ltdb->tdb));
}
@ -927,6 +931,8 @@ static int ltdb_del_trans(struct ldb_module *module)
struct ltdb_private *ltdb =
talloc_get_type(module->private_data, struct ltdb_private);
ltdb->in_transaction--;
if (tdb_transaction_cancel(ltdb->tdb) != 0) {
return ltdb_err_map(tdb_error(ltdb->tdb));
}

2
source/lib/ldb/ldb_tdb/ldb_tdb.h
View File

@ -27,6 +27,8 @@ struct ltdb_private {
int flags;
} last_attribute;
} *cache;
int in_transaction;
};
/*