X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyncrepl.c;h=100daa327d4a32e1f782b7e37383576905b5e8d2;hb=a5eef481237bcb35bd229c9d19888d7745799c56;hp=1cc4b8483299b35121cb76616defbb6a9964a612;hpb=fdce5f2f7eb351a7218b3d168081776e1aae66b2;p=openldap diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 1cc4b84832..100daa327d 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2003-2005 The OpenLDAP Foundation. + * Copyright 2003-2006 The OpenLDAP Foundation. * Portions Copyright 2003 by IBM Corporation. * Portions Copyright 2003 by Howard Chu, Symas Corporation. * All rights reserved. @@ -102,7 +102,7 @@ static int syncrepl_entry( Modifications**,int, struct berval*, struct sync_cookie *, struct berval * ); -static void syncrepl_updateCookie( +static int syncrepl_updateCookie( syncinfo_t *, Operation *, struct berval *, struct sync_cookie * ); static struct berval * slap_uuidstr_from_normalized( @@ -630,8 +630,6 @@ do_syncrep2( int rc, err, i; ber_len_t len; - int rc_efree = 1; - struct berval *psub; Modifications *modlist = NULL; @@ -715,30 +713,28 @@ do_syncrep2( slap_parse_sync_cookie( &syncCookie, NULL ); } } + rc = 0; if ( si->si_syncdata && si->si_logstate == SYNCLOG_LOGGING ) { - entry = NULL; modlist = NULL; - if ( syncrepl_message_to_op( si, op, msg ) == LDAP_SUCCESS && + if (( rc = syncrepl_message_to_op( si, op, msg )) == LDAP_SUCCESS && !BER_BVISNULL( &syncCookie.ctxcsn ) ) { - syncrepl_updateCookie( si, op, psub, &syncCookie ); + rc = syncrepl_updateCookie( si, op, psub, &syncCookie ); } - } else if ( syncrepl_message_to_entry( si, op, msg, - &modlist, &entry, syncstate ) == LDAP_SUCCESS ) { - rc_efree = syncrepl_entry( si, op, entry, &modlist, - syncstate, &syncUUID, &syncCookie_req, &syncCookie.ctxcsn ); - if ( !BER_BVISNULL( &syncCookie.ctxcsn ) ) - { - syncrepl_updateCookie( si, op, psub, &syncCookie ); + } else if (( rc = syncrepl_message_to_entry( si, op, msg, + &modlist, &entry, syncstate )) == LDAP_SUCCESS ) { + if (( rc = syncrepl_entry( si, op, entry, &modlist, + syncstate, &syncUUID, &syncCookie_req, + &syncCookie.ctxcsn )) == LDAP_SUCCESS && + !BER_BVISNULL( &syncCookie.ctxcsn ) ) { + rc = syncrepl_updateCookie( si, op, psub, &syncCookie ); } } ldap_controls_free( rctrls ); if ( modlist ) { slap_mods_free( modlist, 1 ); } - if ( rc_efree && entry ) { - entry_free( entry ); - } - entry = NULL; + if ( rc ) + goto done; break; case LDAP_RES_SEARCH_REFERENCE: @@ -800,7 +796,7 @@ do_syncrep2( if ( !BER_BVISNULL( &syncCookie.ctxcsn ) && match < 0 && err == LDAP_SUCCESS ) { - syncrepl_updateCookie( si, op, psub, &syncCookie ); + rc = syncrepl_updateCookie( si, op, psub, &syncCookie ); } if ( rctrls ) { ldap_controls_free( rctrls ); @@ -943,7 +939,7 @@ do_syncrep2( if ( !BER_BVISNULL( &syncCookie.ctxcsn ) && match < 0 ) { - syncrepl_updateCookie( si, op, psub, &syncCookie); + rc = syncrepl_updateCookie( si, op, psub, &syncCookie); } if ( si->si_refreshPresent == 1 ) { @@ -1363,11 +1359,17 @@ syncrepl_message_to_op( text, 0, 0 ); } else { rc = op->o_bd->be_add( op, &rs ); + Debug( LDAP_DEBUG_SYNC, + "syncrepl_message_to_op: be_add %s (%d)\n", + op->o_req_dn.bv_val, rc, 0 ); } be_entry_release_w( op, op->ora_e ); } else { op->orm_modlist = modlist; rc = op->o_bd->be_modify( op, &rs ); + Debug( LDAP_DEBUG_SYNC, + "syncrepl_message_to_op: be_modify %s (%d)\n", + op->o_req_dn.bv_val, rc, 0 ); } break; case LDAP_REQ_MODRDN: @@ -1391,9 +1393,15 @@ syncrepl_message_to_op( goto done; rc = op->o_bd->be_modrdn( op, &rs ); slap_mods_free( op->orr_modlist, 1 ); + Debug( LDAP_DEBUG_SYNC, + "syncrepl_message_to_op: be_modrdn %s (%d)\n", + op->o_req_dn.bv_val, rc, 0 ); break; case LDAP_REQ_DELETE: rc = op->o_bd->be_delete( op, &rs ); + Debug( LDAP_DEBUG_SYNC, + "syncrepl_message_to_op: be_delete %s (%d)\n", + op->o_req_dn.bv_val, rc, 0 ); break; } done: @@ -1472,7 +1480,6 @@ syncrepl_message_to_entry( } e = ( Entry * ) ch_calloc( 1, sizeof( Entry ) ); - *entry = e; e->e_name = op->o_req_dn; e->e_nname = op->o_req_ndn; @@ -1548,9 +1555,10 @@ done: if ( rc != LDAP_SUCCESS ) { if ( e ) { entry_free( e ); - *entry = e = NULL; + e = NULL; } } + *entry = e; return rc; } @@ -1613,7 +1621,6 @@ syncrepl_entry( AttributeAssertion ava = { NULL, BER_BVNULL }; #endif int rc = LDAP_SUCCESS; - int ret = LDAP_SUCCESS; struct berval pdn = BER_BVNULL; dninfo dni = {0}; @@ -1747,8 +1754,15 @@ syncrepl_entry( case LDAP_SYNC_MODIFY: { Attribute *a = attr_find( entry->e_attrs, slap_schema.si_ad_entryCSN ); - if ( a ) + if ( a ) { + /* FIXME: op->o_csn is assumed to be + * on the thread's slab; this needs + * to be cleared ASAP. + * What happens if already present? + */ + assert( BER_BVISNULL( &op->o_csn ) ); op->o_csn = a->a_vals[0]; + } } retry_add:; if ( BER_BVISNULL( &dni.dn )) { @@ -1765,15 +1779,15 @@ retry_add:; switch ( rs_add.sr_err ) { case LDAP_SUCCESS: be_entry_release_w( op, entry ); - ret = 0; + entry = NULL; break; case LDAP_REFERRAL: /* we assume that LDAP_NO_SUCH_OBJECT is returned * only if the suffix entry is not present */ case LDAP_NO_SUCH_OBJECT: - syncrepl_add_glue( op, entry ); - ret = 0; + rc = syncrepl_add_glue( op, entry ); + entry = NULL; break; /* if an entry was added via syncrepl_add_glue(), @@ -1809,7 +1823,8 @@ retry_add:; cb2.sc_response = dn_callback; cb2.sc_private = &dni; - be->be_search( &op2, &rs2 ); + rc = be->be_search( &op2, &rs2 ); + if ( rc ) goto done; retry = 0; goto retry_add; @@ -1820,7 +1835,6 @@ retry_add:; Debug( LDAP_DEBUG_ANY, "syncrepl_entry : be_add failed (%d)\n", rs_add.sr_err, 0, 0 ); - ret = 1; break; } goto done; @@ -1837,14 +1851,18 @@ retry_add:; dnParent( &dni.ndn, &noldp ); dnParent( &entry->e_nname, &nnewp ); - if ( !dn_match( &noldp, &newp )) { + if ( !dn_match( &noldp, &nnewp )) { dnParent( &entry->e_name, &newp ); op->orr_newSup = &newp; op->orr_nnewSup = &nnewp; } op->orr_deleteoldrdn = 0; op->orr_modlist = NULL; + if (( rc = slap_modrdn2mods( op, &rs_modify ))) { + goto done; + } rc = be->be_modrdn( op, &rs_modify ); + slap_mods_free( op->orr_modlist, 1 ); Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: %s (%d)\n", "be_modrdn", rc, 0 ); @@ -1852,7 +1870,6 @@ retry_add:; op->o_req_dn = entry->e_name; op->o_req_ndn = entry->e_nname; } else { - ret = 1; goto done; } } @@ -1918,7 +1935,6 @@ retry_add:; rs_modify.sr_err, 0, 0 ); } } - ret = 1; goto done; case LDAP_SYNC_DELETE : if ( !BER_BVISNULL( &dni.dn )) { @@ -1946,17 +1962,15 @@ retry_add:; } } } - ret = 0; goto done; default : Debug( LDAP_DEBUG_ANY, "syncrepl_entry : unknown syncstate\n", 0, 0, 0 ); - ret = 1; goto done; } -done : +done: if ( !BER_BVISNULL( &syncUUID_strrep ) ) { slap_sl_free( syncUUID_strrep.bv_val, op->o_tmpmemctx ); BER_BVZERO( &syncUUID_strrep ); @@ -1970,8 +1984,10 @@ done : if ( !BER_BVISNULL( &dni.dn ) ) { op->o_tmpfree( dni.dn.bv_val, op->o_tmpmemctx ); } + if ( entry ) + entry_free( entry ); BER_BVZERO( &op->o_csn ); - return ret; + return rc; } static struct berval gcbva[] = { @@ -2035,8 +2051,12 @@ syncrepl_del_nonpresent( for (i=0; uuids[i].bv_val; i++) { op->ors_slimit = 1; + slap_uuidstr_from_normalized( &uf.f_av_value, &uuids[i], + op->o_tmpmemctx ); + filter2bv_x( op, op->ors_filter, &op->ors_filterstr ); uf.f_av_value = uuids[i]; rc = be->be_search( op, &rs_search ); + op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx ); } si->si_refreshDelete ^= NP_DELETE_ONE; } else { @@ -2074,6 +2094,9 @@ syncrepl_del_nonpresent( op->o_req_dn = *np_prev->npe_name; op->o_req_ndn = *np_prev->npe_nname; rc = op->o_bd->be_delete( op, &rs_delete ); + Debug( LDAP_DEBUG_SYNC, + "syncrepl_del_nonpresent: be_delete %s (%d)\n", + op->o_req_dn.bv_val, rc, 0 ); if ( rs_delete.sr_err == LDAP_NOT_ALLOWED_ON_NONLEAF ) { Modifications mod1, mod2; @@ -2124,12 +2147,15 @@ syncrepl_del_nonpresent( } slap_graduate_commit_csn( op ); + + op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx ); + BER_BVZERO( &op->o_csn ); } return; } -void +int syncrepl_add_glue( Operation* op, Entry *e ) @@ -2239,6 +2265,10 @@ syncrepl_add_glue( } else { /* incl. ALREADY EXIST */ entry_free( glue ); + if ( rs_add.sr_err != LDAP_ALREADY_EXISTS ) { + entry_free( e ); + return rc; + } } /* Move to next child */ @@ -2269,10 +2299,10 @@ syncrepl_add_glue( entry_free( e ); } - return; + return rc; } -static void +static int syncrepl_updateCookie( syncinfo_t *si, Operation *op, @@ -2288,18 +2318,14 @@ syncrepl_updateCookie( slap_callback cb = { NULL }; SlapReply rs_modify = {REP_RESULT}; - slap_sync_cookie_free( &si->si_syncCookie, 0 ); - slap_dup_sync_cookie( &si->si_syncCookie, syncCookie ); - mod.sml_op = LDAP_MOD_REPLACE; mod.sml_desc = slap_schema.si_ad_contextCSN; mod.sml_type = mod.sml_desc->ad_cname; mod.sml_values = vals; - vals[0] = si->si_syncCookie.ctxcsn; - vals[1].bv_val = NULL; - vals[1].bv_len = 0; + vals[0] = syncCookie->ctxcsn; + BER_BVZERO( &vals[1] ); - slap_queue_csn( op, &si->si_syncCookie.ctxcsn ); + slap_queue_csn( op, &syncCookie->ctxcsn ); op->o_tag = LDAP_REQ_MODIFY; @@ -2318,14 +2344,20 @@ syncrepl_updateCookie( rc = be->be_modify( op, &rs_modify ); op->o_msgid = 0; - if ( rs_modify.sr_err != LDAP_SUCCESS ) { + if ( rs_modify.sr_err == LDAP_SUCCESS ) { + slap_sync_cookie_free( &si->si_syncCookie, 0 ); + slap_dup_sync_cookie( &si->si_syncCookie, syncCookie ); + } else { Debug( LDAP_DEBUG_ANY, "be_modify failed (%d)\n", rs_modify.sr_err, 0, 0 ); } slap_graduate_commit_csn( op ); - return; + op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx ); + BER_BVZERO( &op->o_csn ); + + return rc; } static int @@ -2568,6 +2600,14 @@ avl_ber_bvfree( void *v_bv ) void syncinfo_free( syncinfo_t *sie ) { + /* re-fetch it, in case it was already removed */ + sie->si_re = ldap_pvt_runqueue_find( &slapd_rq, do_syncrepl, sie ); + if ( sie->si_re ) { + if ( ldap_pvt_runqueue_isrunning( &slapd_rq, sie->si_re ) ) + ldap_pvt_runqueue_stoptask( &slapd_rq, sie->si_re ); + ldap_pvt_runqueue_remove( &slapd_rq, sie->si_re ); + } + ldap_pvt_thread_mutex_destroy( &sie->si_mutex ); bindconf_free( &sie->si_bindconf ); @@ -3066,7 +3106,7 @@ parse_syncrepl_line( if ( strcasecmp( val, "unlimited" ) == 0 ) { si->si_slimit = 0; - } else if ( lutil_atoi( &si->si_slimit, val ) != 0 || val < 0 ) { + } else if ( lutil_atoi( &si->si_slimit, val ) != 0 || si->si_slimit < 0 ) { snprintf( c->msg, sizeof( c->msg ), "invalid size limit value \"%s\".\n", val ); @@ -3080,7 +3120,7 @@ parse_syncrepl_line( if ( strcasecmp( val, "unlimited" ) == 0 ) { si->si_tlimit = 0; - } else if ( lutil_atoi( &si->si_tlimit, val ) != 0 || val < 0 ) { + } else if ( lutil_atoi( &si->si_tlimit, val ) != 0 || si->si_tlimit < 0 ) { snprintf( c->msg, sizeof( c->msg ), "invalid time limit value \"%s\".\n", val ); @@ -3361,12 +3401,6 @@ syncrepl_config( ConfigArgs *c ) struct re_s *re; if ( c->be->be_syncinfo ) { - re = c->be->be_syncinfo->si_re; - if ( re ) { - if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ) ) - ldap_pvt_runqueue_stoptask( &slapd_rq, re ); - ldap_pvt_runqueue_remove( &slapd_rq, re ); - } syncinfo_free( c->be->be_syncinfo ); c->be->be_syncinfo = NULL; }