upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7140 more cleanup on txn abort

Browse source
This commit is contained in:
Howard Chu 2012-01-28 11:52:09 -08:00
parent 4069a34803
commit d7933e2ea4
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/back-mdb/tools.c
View file

@ -679,9 +679,13 @@ done:
}
} else {
unsigned i;
mdb_txn_abort( txn );
txn = NULL;
cursor = NULL;
idcursor = NULL;
for ( i=0; i<mdb->mi_nattrs; i++ )
mdb->mi_attrs[i]->ai_cursor = NULL;
mdb_writes = 0;
snprintf( text->bv_val, text->bv_len,
"txn_aborted! %s (%d)",
rc == LDAP_OTHER ? "Internal error" :
@ -799,9 +803,7 @@ int mdb_tool_entry_reindex(
/*
* just (re)add them for now
* assume that some other routine (not yet implemented)
* will zap index databases
*
* Use truncate mode to empty/reset index databases
*/
Debug( LDAP_DEBUG_TRACE,
@ -822,6 +824,7 @@ done:
unsigned i;
MDB_TOOL_IDL_FLUSH( be, txi );
rc = mdb_txn_commit( txi );
mdb_writes = 0;
for ( i=0; i<mi->mi_nattrs; i++ )
mi->mi_attrs[i]->ai_cursor = NULL;
if( rc != 0 ) {
@ -835,7 +838,11 @@ done:
}
} else {
unsigned i;
mdb_writes = 0;
mdb_txn_abort( txi );
for ( i=0; i<mi->mi_nattrs; i++ )
mi->mi_attrs[i]->ai_cursor = NULL;
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(mdb_tool_entry_reindex)
": txn_aborted! err=%d\n",