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

ITS#9993 fix online_indexer termination/cleanup

Browse source
This commit is contained in:
Howard Chu 2023-02-01 20:30:22 +00:00
parent fa64703e6c
commit 69f52354d2
1 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
servers/slapd/back-mdb/config.c
View file

@ -214,6 +214,10 @@ mdb_online_index( void *ctx, void *arg )
int i, first = 1; int i, first = 1;
int intr = 0; int intr = 0;
Debug( LDAP_DEBUG_ARGS,
LDAP_XSTRING(mdb_online_index) ": database %s: "
"starting\n", be->be_suffix[0].bv_val );
connection_fake_init( &conn, &opbuf, ctx ); connection_fake_init( &conn, &opbuf, ctx );
op = &opbuf.ob_op; op = &opbuf.ob_op;
@ -275,6 +279,10 @@ mdb_online_index( void *ctx, void *arg )
memcpy( &id, key.mv_data, sizeof( id )); memcpy( &id, key.mv_data, sizeof( id ));
} }
Debug( LDAP_DEBUG_ARGS,
LDAP_XSTRING(mdb_online_index) ": database %s: "
"indexing %lx\n", be->be_suffix[0].bv_val, (long)id );
rc = mdb_id2entry( op, curs, id, &e ); rc = mdb_id2entry( op, curs, id, &e );
mdb_cursor_close( curs ); mdb_cursor_close( curs );
if ( rc ) { if ( rc ) {
@ -308,6 +316,14 @@ mdb_online_index( void *ctx, void *arg )
/* all done */ /* all done */
if ( !intr ) { if ( !intr ) {
rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
if ( rc ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(mdb_online_index) ": database %s: "
"final txn_begin failed: %s (%d)\n",
be->be_suffix[0].bv_val, mdb_strerror(rc), rc );
intr = 1; /* maybe it will succeed on a future retry */
} else {
for ( i = 0; i < mdb->mi_nattrs; i++ ) { for ( i = 0; i < mdb->mi_nattrs; i++ ) {
if ( mdb->mi_attrs[ i ]->ai_indexmask & MDB_INDEX_DELETING if ( mdb->mi_attrs[ i ]->ai_indexmask & MDB_INDEX_DELETING
|| mdb->mi_attrs[ i ]->ai_newmask == 0 ) || mdb->mi_attrs[ i ]->ai_newmask == 0 )
@ -317,14 +333,17 @@ mdb_online_index( void *ctx, void *arg )
mdb->mi_attrs[ i ]->ai_indexmask = mdb->mi_attrs[ i ]->ai_newmask; mdb->mi_attrs[ i ]->ai_indexmask = mdb->mi_attrs[ i ]->ai_newmask;
mdb->mi_attrs[ i ]->ai_newmask = 0; mdb->mi_attrs[ i ]->ai_newmask = 0;
} }
/* zero out checkpoint DB */ /* zero out checkpoint DB */
rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
if ( !rc ) {
mdb_drop( txn, mdb->mi_idxckp, 0 ); mdb_drop( txn, mdb->mi_idxckp, 0 );
mdb_txn_commit( txn ); mdb_txn_commit( txn );
} }
} }
Debug( LDAP_DEBUG_ARGS,
LDAP_XSTRING(mdb_online_index) ": database %s: "
"stopping, %s done\n", be->be_suffix[0].bv_val, intr ? "not" : "all" );
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask ))
ldap_pvt_runqueue_stoptask( &slapd_rq, rtask ); ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
@ -361,6 +380,10 @@ mdb_setup_indexer( struct mdb_info *mdb )
return rc; return rc;
} }
Debug( LDAP_DEBUG_ARGS,
LDAP_XSTRING(mdb_setup_indexer) ": path %s: "
"starting\n", mdb->mi_dbenv_home );
key.mv_size = sizeof( s ); key.mv_size = sizeof( s );
key.mv_data = &s; key.mv_data = &s;
@ -389,6 +412,9 @@ mdb_setup_indexer( struct mdb_info *mdb )
data.mv_size = sizeof( ID ); data.mv_size = sizeof( ID );
data.mv_data = &id; data.mv_data = &id;
rc = mdb_cursor_put( curs, &key, &data, 0 ); rc = mdb_cursor_put( curs, &key, &data, 0 );
Debug( LDAP_DEBUG_ARGS,
LDAP_XSTRING(mdb_setup_indexer) ": path %s: "
"resetting to 0\n", mdb->mi_dbenv_home );
} }
done: done: