X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fctxcsn.c;h=cb828999ccfea8d971949cf05858ae5358cfcf7f;hb=5b98495d5c45ae43a0774f058fe073e145162050;hp=772bfa17fba9641ec6872bdf1687819aa9494ab2;hpb=ad8180b3b9d5be1d268c24e06a0e94a4785b72b0;p=openldap diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c index 772bfa17fb..cb828999cc 100644 --- a/servers/slapd/ctxcsn.c +++ b/servers/slapd/ctxcsn.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2003-2008 The OpenLDAP Foundation. + * Copyright 2003-2009 The OpenLDAP Foundation. * Portions Copyright 2003 IBM Corporation. * All rights reserved. * @@ -26,39 +26,61 @@ #include "slap.h" #include "lutil_ldap.h" -const struct berval slap_ldapsync_bv = BER_BVC("ldapsync"); -const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync"); int slap_serverID; +/* maxcsn->bv_val must point to a char buf[LDAP_LUTIL_CSNSTR_BUFSIZE] */ void slap_get_commit_csn( Operation *op, - struct berval *maxcsn + struct berval *maxcsn, + int *foundit ) { struct slap_csn_entry *csne, *committed_csne = NULL; BackendDB *be = op->o_bd->bd_self; + int sid = -1; if ( maxcsn ) { - BER_BVZERO( maxcsn ); + assert( maxcsn->bv_val != NULL ); + assert( maxcsn->bv_len >= LDAP_LUTIL_CSNSTR_BUFSIZE ); } + if ( foundit ) { + *foundit = 0; + } + + ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex ); - ldap_pvt_thread_mutex_lock( be->be_pcl_mutexp ); + if ( !BER_BVISEMPTY( &op->o_csn )) { + sid = slap_parse_csn_sid( &op->o_csn ); + } LDAP_TAILQ_FOREACH( csne, be->be_pending_csn_list, ce_csn_link ) { if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) { csne->ce_state = SLAP_CSN_COMMIT; + if ( foundit ) *foundit = 1; break; } } LDAP_TAILQ_FOREACH( csne, be->be_pending_csn_list, ce_csn_link ) { - if ( csne->ce_state == SLAP_CSN_COMMIT ) committed_csne = csne; - if ( csne->ce_state == SLAP_CSN_PENDING ) break; + if ( sid != -1 && sid == csne->ce_sid ) { + if ( csne->ce_state == SLAP_CSN_COMMIT ) committed_csne = csne; + if ( csne->ce_state == SLAP_CSN_PENDING ) break; + } } - if ( committed_csne && maxcsn ) *maxcsn = committed_csne->ce_csn; - ldap_pvt_thread_mutex_unlock( be->be_pcl_mutexp ); + if ( maxcsn ) { + if ( committed_csne ) { + if ( committed_csne->ce_csn.bv_len < maxcsn->bv_len ) + maxcsn->bv_len = committed_csne->ce_csn.bv_len; + AC_MEMCPY( maxcsn->bv_val, committed_csne->ce_csn.bv_val, + maxcsn->bv_len+1 ); + } else { + maxcsn->bv_len = 0; + maxcsn->bv_val[0] = 0; + } + } + ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex ); } void @@ -67,7 +89,7 @@ slap_rewind_commit_csn( Operation *op ) struct slap_csn_entry *csne; BackendDB *be = op->o_bd->bd_self; - ldap_pvt_thread_mutex_lock( be->be_pcl_mutexp ); + ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex ); LDAP_TAILQ_FOREACH( csne, be->be_pending_csn_list, ce_csn_link ) { if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) { @@ -76,7 +98,7 @@ slap_rewind_commit_csn( Operation *op ) } } - ldap_pvt_thread_mutex_unlock( be->be_pcl_mutexp ); + ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex ); } void @@ -89,15 +111,7 @@ slap_graduate_commit_csn( Operation *op ) if ( op->o_bd == NULL ) return; be = op->o_bd->bd_self; -#if 0 - /* it is NULL when we get here from the frontendDB; - * alternate fix: initialize frontendDB like all other backends */ - assert( op->o_bd->be_pcl_mutexp != NULL ); -#endif - - if ( be->be_pcl_mutexp == NULL ) return; - - ldap_pvt_thread_mutex_lock( be->be_pcl_mutexp ); + ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex ); LDAP_TAILQ_FOREACH( csne, be->be_pending_csn_list, ce_csn_link ) { if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) { @@ -114,51 +128,11 @@ slap_graduate_commit_csn( Operation *op ) } } - ldap_pvt_thread_mutex_unlock( be->be_pcl_mutexp ); + ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex ); return; } -static struct berval ocbva[] = { - BER_BVC("top"), - BER_BVC("subentry"), - BER_BVC("syncProviderSubentry"), - BER_BVNULL -}; - -Entry * -slap_create_context_csn_entry( - Backend *be, - struct berval *context_csn ) -{ - Entry* e; - - struct berval bv; - - e = entry_alloc(); - - attr_merge( e, slap_schema.si_ad_objectClass, - ocbva, NULL ); - attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, - &ocbva[1], NULL ); - attr_merge_one( e, slap_schema.si_ad_cn, - (struct berval *)&slap_ldapsync_bv, NULL ); - - if ( context_csn ) { - attr_merge_one( e, slap_schema.si_ad_contextCSN, - context_csn, NULL ); - } - - BER_BVSTR( &bv, "{}" ); - attr_merge_one( e, slap_schema.si_ad_subtreeSpecification, &bv, NULL ); - - build_new_dn( &e->e_name, &be->be_nsuffix[0], - (struct berval *)&slap_ldapsync_cn_bv, NULL ); - ber_dupbv( &e->e_nname, &e->e_name ); - - return e; -} - void slap_queue_csn( Operation *op, @@ -172,16 +146,17 @@ slap_queue_csn( Debug( LDAP_DEBUG_SYNC, "slap_queue_csn: queing %p %s\n", csn->bv_val, csn->bv_val, 0 ); - ldap_pvt_thread_mutex_lock( be->be_pcl_mutexp ); + ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex ); ber_dupbv( &pending->ce_csn, csn ); ber_bvreplace_x( &op->o_csn, &pending->ce_csn, op->o_tmpmemctx ); + pending->ce_sid = slap_parse_csn_sid( csn ); pending->ce_connid = op->o_connid; pending->ce_opid = op->o_opid; pending->ce_state = SLAP_CSN_PENDING; LDAP_TAILQ_INSERT_TAIL( be->be_pending_csn_list, pending, ce_csn_link ); - ldap_pvt_thread_mutex_unlock( be->be_pcl_mutexp ); + ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex ); } int @@ -195,10 +170,10 @@ slap_get_csn( /* gmtime doesn't always need a mutex, but lutil_csnstr does */ ldap_pvt_thread_mutex_lock( &gmtime_mutex ); csn->bv_len = lutil_csnstr( csn->bv_val, csn->bv_len, slap_serverID, 0 ); - ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); - if ( manage_ctxcsn ) slap_queue_csn( op, csn ); + ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); + return LDAP_SUCCESS; }