upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch MDB txn reuse/sync errors.

Browse source
This commit is contained in:
Hallvard Furuseth 2013-04-18 04:16:07 +02:00
parent 8a562f560e
commit afe488d8a9
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/liblmdb/lmdb.h
View file

@ -370,7 +370,9 @@ typedef enum MDB_cursor_op {
#define MDB_MAP_RESIZED (-30785) #define MDB_MAP_RESIZED (-30785)
/** Database flags changed or would change */ /** Database flags changed or would change */
#define MDB_INCOMPATIBLE (-30784) #define MDB_INCOMPATIBLE (-30784)
#define MDB_LAST_ERRCODE MDB_INCOMPATIBLE /** Invalid reuse of reader locktable slot */
#define MDB_BAD_RSLOT (-30783)
#define MDB_LAST_ERRCODE MDB_BAD_RSLOT
/** @} */ /** @} */
/** @brief Statistics for a database in the environment */ /** @brief Statistics for a database in the environment */

12
libraries/liblmdb/mdb.c
View file

@ -1083,6 +1083,7 @@ static char *const mdb_errstr[] = {
"MDB_PAGE_FULL: Internal error - page has no more space", "MDB_PAGE_FULL: Internal error - page has no more space",
"MDB_MAP_RESIZED: Database contents grew beyond environment mapsize", "MDB_MAP_RESIZED: Database contents grew beyond environment mapsize",
"MDB_INCOMPATIBLE: Database flags changed or would change", "MDB_INCOMPATIBLE: Database flags changed or would change",
"MDB_BAD_RSLOT: Invalid reuse of reader locktable slot",
}; };
char * char *
@ -1792,7 +1793,10 @@ mdb_txn_renew0(MDB_txn *txn)
txn->mt_u.reader = NULL; txn->mt_u.reader = NULL;
} else { } else {
MDB_reader *r = pthread_getspecific(env->me_txkey); MDB_reader *r = pthread_getspecific(env->me_txkey);
if (!r) { if (r) {
if (r->mr_pid != env->me_pid || r->mr_txnid != (txnid_t)-1)
return MDB_BAD_RSLOT;
} else {
pid_t pid = env->me_pid; pid_t pid = env->me_pid;
pthread_t tid = pthread_self(); pthread_t tid = pthread_self();
@ -1863,7 +1867,7 @@ mdb_txn_renew(MDB_txn *txn)
{ {
int rc; int rc;
if (! (txn && (txn->mt_flags & MDB_TXN_RDONLY))) if (!txn || txn->mt_numdbs || !(txn->mt_flags & MDB_TXN_RDONLY))
return EINVAL; return EINVAL;
if (txn->mt_env->me_flags & MDB_FATAL_ERROR) { if (txn->mt_env->me_flags & MDB_FATAL_ERROR) {
@ -2066,6 +2070,10 @@ mdb_txn_reset(MDB_txn *txn)
txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w', txn->mt_txnid, (txn->mt_flags & MDB_TXN_RDONLY) ? 'r' : 'w',
(void *) txn, (void *)txn->mt_env, txn->mt_dbs[MAIN_DBI].md_root); (void *) txn, (void *)txn->mt_env, txn->mt_dbs[MAIN_DBI].md_root);
/* This call is only valid for read-only txns */
if (!(txn->mt_flags & MDB_TXN_RDONLY))
return;
mdb_txn_reset0(txn); mdb_txn_reset0(txn);
} }