LDAP_LIST_ENTRY(nonpresent_entry) npe_link;
};
+typedef struct cookie_state {
+ ldap_pvt_thread_mutex_t cs_mutex;
+ int cs_num;
+ int cs_age;
+ struct berval *cs_vals;
+ int *cs_sids;
+} cookie_state;
+
#define SYNCDATA_DEFAULT 0 /* entries are plain LDAP entries */
#define SYNCDATA_ACCESSLOG 1 /* entries are accesslog format */
#define SYNCDATA_CHANGELOG 2 /* entries are changelog format */
#define RETRYNUM_FINITE(n) ((n) > RETRYNUM_FOREVER) /* not forever */
typedef struct syncinfo_s {
- struct slap_backend_db *si_be;
- struct re_s *si_re;
- long si_rid;
+ struct syncinfo_s *si_next;
+ BackendDB *si_be;
+ BackendDB *si_wbe;
+ struct re_s *si_re;
+ int si_rid;
+ char si_ridtxt[8];
slap_bindconf si_bindconf;
struct berval si_base;
struct berval si_logbase;
struct berval si_filterstr;
struct berval si_logfilterstr;
- int si_scope;
- int si_attrsonly;
- char *si_anfile;
+ int si_scope;
+ int si_attrsonly;
+ char *si_anfile;
AttributeName *si_anlist;
AttributeName *si_exanlist;
- char **si_attrs;
- char **si_exattrs;
- int si_allattrs;
- int si_allopattrs;
- int si_schemachecking;
- int si_type; /* the active type */
- int si_ctype; /* the configured type */
- time_t si_interval;
- time_t *si_retryinterval;
- int *si_retrynum_init;
- int *si_retrynum;
+ char **si_attrs;
+ char **si_exattrs;
+ int si_allattrs;
+ int si_allopattrs;
+ int si_schemachecking;
+ int si_type; /* the active type */
+ int si_ctype; /* the configured type */
+ time_t si_interval;
+ time_t *si_retryinterval;
+ int *si_retrynum_init;
+ int *si_retrynum;
struct sync_cookie si_syncCookie;
- int si_manageDSAit;
- int si_slimit;
- int si_tlimit;
- int si_refreshDelete;
- int si_refreshPresent;
- int si_syncdata;
- int si_logstate;
- int si_conn_setup;
- Avlnode *si_presentlist;
- LDAP *si_ld;
- LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist;
+ cookie_state *si_cookieState;
+ int si_cookieAge;
+ int si_manageDSAit;
+ int si_slimit;
+ int si_tlimit;
+ int si_refreshDelete;
+ int si_refreshPresent;
+ int si_syncdata;
+ int si_logstate;
+ int si_conn_setup;
+ Avlnode *si_presentlist;
+ LDAP *si_ld;
+ LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist;
ldap_pvt_thread_mutex_t si_mutex;
} syncinfo_t;
Modifications **, Entry **, int );
static int syncrepl_entry(
syncinfo_t *, Operation*, Entry*,
- Modifications**,int, struct berval*,
- struct sync_cookie *,
- struct berval * );
+ Modifications**,int, struct berval* );
static int syncrepl_updateCookie(
syncinfo_t *, Operation *, struct berval *,
struct sync_cookie * );
struct berval *, struct berval *, void * );
/* callback functions */
-static int dn_callback( struct slap_op *, struct slap_rep * );
-static int nonpresent_callback( struct slap_op *, struct slap_rep * );
-static int null_callback( struct slap_op *, struct slap_rep * );
+static int dn_callback( Operation *, SlapReply * );
+static int nonpresent_callback( Operation *, SlapReply * );
+static int null_callback( Operation *, SlapReply * );
static AttributeDescription *sync_descs[4];
/* If we're using a log but we have no state, then fallback to
* normal mode for a full refresh.
*/
- if ( si->si_syncdata && BER_BVISEMPTY( &si->si_syncCookie.ctxcsn ) ) {
+ if ( si->si_syncdata && !si->si_syncCookie.numcsns ) {
si->si_logstate = SYNCLOG_FALLBACK;
}
int cmdline_cookie_found = 0;
struct sync_cookie *sc = NULL;
- struct berval *psub;
#ifdef HAVE_TLS
void *ssl;
#endif
- psub = &si->si_be->be_nsuffix[0];
-
rc = slap_client_connect( &si->si_ld, &si->si_bindconf );
if ( rc != LDAP_SUCCESS ) {
goto done;
op->o_ssf = ( op->o_sasl_ssf > op->o_tls_ssf )
? op->o_sasl_ssf : op->o_tls_ssf;
-
+ /* We've just started up, or the remote server hasn't sent us
+ * any meaningful state.
+ */
if ( BER_BVISNULL( &si->si_syncCookie.octet_str ) ) {
- /* get contextCSN shadow replica from database */
- BerVarray csn = NULL;
-
- assert( si->si_rid < 1000 );
- op->o_req_ndn = op->o_bd->be_nsuffix[0];
- op->o_req_dn = op->o_req_ndn;
-
- /* try to read stored contextCSN */
- backend_attribute( op, NULL, &op->o_req_ndn,
- slap_schema.si_ad_contextCSN, &csn, ACL_READ );
- if ( csn ) {
- ch_free( si->si_syncCookie.ctxcsn.bv_val );
- ber_dupbv( &si->si_syncCookie.ctxcsn, csn );
- ber_bvarray_free_x( csn, op->o_tmpmemctx );
- }
+ int i;
si->si_syncCookie.rid = si->si_rid;
+ si->si_syncCookie.sid = SLAP_SINGLE_SHADOW( si->si_be ) ? -1 :
+ slap_serverID;
LDAP_STAILQ_FOREACH( sc, &slap_sync_cookie, sc_next ) {
if ( si->si_rid == sc->rid ) {
/* ctxcsn wasn't parsed yet, do it now */
slap_parse_sync_cookie( sc, op->o_tmpmemctx );
- if ( BER_BVISNULL( &sc->ctxcsn ) ) {
- /* if cmdline cookie does not have ctxcsn */
- /* component, set it to an initial value */
- slap_init_sync_cookie_ctxcsn( sc );
- }
slap_sync_cookie_free( &si->si_syncCookie, 0 );
slap_dup_sync_cookie( &si->si_syncCookie, sc );
slap_sync_cookie_free( sc, 1 );
+ } else {
+ ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex );
+ if ( !si->si_cookieState->cs_num ) {
+ /* get contextCSN shadow replica from database */
+ BerVarray csn = NULL;
+ void *ctx = op->o_tmpmemctx;
+
+ op->o_req_ndn = op->o_bd->be_nsuffix[0];
+ op->o_req_dn = op->o_req_ndn;
+
+ /* try to read stored contextCSN */
+ op->o_tmpmemctx = NULL;
+ backend_attribute( op, NULL, &op->o_req_ndn,
+ slap_schema.si_ad_contextCSN, &csn, ACL_READ );
+ op->o_tmpmemctx = ctx;
+ if ( csn ) {
+ si->si_cookieState->cs_vals = csn;
+ for (i=0; !BER_BVISNULL( &csn[i] ); i++);
+ si->si_cookieState->cs_num = i;
+ si->si_cookieState->cs_sids = slap_parse_csn_sids( csn, i, NULL );
+ }
+ }
+ if ( si->si_cookieState->cs_num ) {
+ ber_bvarray_free( si->si_syncCookie.ctxcsn );
+ if ( ber_bvarray_dup_x( &si->si_syncCookie.ctxcsn,
+ si->si_cookieState->cs_vals, NULL )) {
+ rc = LDAP_NO_MEMORY;
+ goto done;
+ }
+ si->si_syncCookie.numcsns = si->si_cookieState->cs_num;
+ si->si_syncCookie.sids = ch_malloc( si->si_cookieState->cs_num *
+ sizeof(int) );
+ for ( i=0; i<si->si_syncCookie.numcsns; i++ )
+ si->si_syncCookie.sids[i] = si->si_cookieState->cs_sids[i];
+ }
+ ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
}
slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str,
- &si->si_syncCookie.ctxcsn, si->si_syncCookie.rid );
+ si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
+ si->si_syncCookie.sid );
+ } else {
+ AttributeName at[2];
+ Attribute a = { slap_schema.si_ad_contextCSN };
+ Entry e = {0};
+ SlapReply rs = {0};
+ int i, j, changed = 0;
+
+ /* Look for contextCSN from syncprov overlay. If
+ * there's no overlay, this will be a no-op. That means
+ * this is a pure consumer, so local changes will not be
+ * allowed, and all changes will already be reflected in
+ * the cookieState.
+ */
+ e.e_attrs = &a;
+ e.e_name = si->si_wbe->be_suffix[0];
+ e.e_nname = si->si_wbe->be_nsuffix[0];
+ rs.sr_entry = &e;
+ rs.sr_flags = REP_ENTRY_MODIFIABLE;
+ at[0].an_name = a.a_desc->ad_cname;
+ at[0].an_desc = a.a_desc;
+ BER_BVZERO( &at[1].an_name );
+
+ ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex );
+ rc = backend_operational( op, &rs );
+ if ( rc == LDAP_SUCCESS && a.a_vals ) {
+ int num;
+ for (i=0; !BER_BVISNULL( &a.a_vals[i] ); i++) ;
+ num = i;
+ /* check for differences */
+ if ( num != si->si_cookieState->cs_num ) {
+ changed = 1;
+ } else {
+ for ( i=0; i<num; i++ ) {
+ if ( ber_bvcmp( &a.a_vals[i],
+ &si->si_cookieState->cs_vals[i] )) {
+ changed =1;
+ break;
+ }
+ }
+ }
+ if ( changed ) {
+ ber_bvarray_free( si->si_cookieState->cs_vals );
+ ch_free( si->si_cookieState->cs_sids );
+ si->si_cookieState->cs_num = num;
+ si->si_cookieState->cs_vals = a.a_vals;
+ si->si_cookieState->cs_sids = slap_parse_csn_sids( a.a_vals,
+ num, NULL );
+ si->si_cookieState->cs_age++;
+ } else {
+ ber_bvarray_free( a.a_vals );
+ }
+ changed = 0;
+ }
+ /* See if the cookieState has changed due to anything outside
+ * this particular consumer. That includes other consumers in
+ * the same context, or local changes detected above.
+ */
+ if ( si->si_cookieState->cs_num > 1 && si->si_cookieAge !=
+ si->si_cookieState->cs_age ) {
+
+ for (i=0; !BER_BVISNULL( &si->si_syncCookie.ctxcsn[i] ); i++) {
+ /* bogus, just dup everything */
+ if ( si->si_syncCookie.sids[i] == -1 ) {
+ ber_bvarray_free( si->si_syncCookie.ctxcsn );
+ ber_bvarray_dup_x( &si->si_syncCookie.ctxcsn,
+ si->si_cookieState->cs_vals, NULL );
+ changed = 1;
+ break;
+ }
+ for (j=0; j<si->si_cookieState->cs_num; j++) {
+ if ( si->si_syncCookie.sids[i] !=
+ si->si_cookieState->cs_sids[j] )
+ continue;
+ if ( bvmatch( &si->si_syncCookie.ctxcsn[i],
+ &si->si_cookieState->cs_vals[j] ))
+ break;
+ ber_bvreplace( &si->si_syncCookie.ctxcsn[i],
+ &si->si_cookieState->cs_vals[j] );
+ changed = 1;
+ break;
+ }
+ }
+ if ( changed ) {
+ ch_free( si->si_syncCookie.octet_str.bv_val );
+ slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str,
+ si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
+ SLAP_SINGLE_SHADOW( si->si_be ) ? -1 : slap_serverID );
+ }
+ }
+ ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
}
rc = ldap_sync_search( si, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY, "do_syncrep1: rid %03ld "
+ Debug( LDAP_DEBUG_ANY, "do_syncrep1: %s "
"ldap_search_ext: %s (%d)\n",
- si->si_rid, ldap_err2string( rc ), rc );
+ si->si_ridtxt, ldap_err2string( rc ), rc );
}
done:
return rc;
}
+static int
+compare_csns( struct sync_cookie *sc1, struct sync_cookie *sc2, int *which )
+{
+ int i, j, match = 0;
+ const char *text;
+
+ *which = 0;
+
+ if ( sc1->numcsns < sc2->numcsns ) {
+ *which = sc1->numcsns;
+ return -1;
+ }
+
+ for (i=0; !BER_BVISNULL( &sc1->ctxcsn[i] ); i++) {
+ for (j=0; !BER_BVISNULL( &sc2->ctxcsn[j] ); j++) {
+ if ( sc1->sids[i] != sc2->sids[j] )
+ continue;
+ value_match( &match, slap_schema.si_ad_entryCSN,
+ slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ &sc1->ctxcsn[i], &sc2->ctxcsn[i], &text );
+ if ( match < 0 ) {
+ *which = j;
+ return match;
+ }
+ break;
+ }
+ }
+ return match;
+}
+
static int
do_syncrep2(
Operation *op,
int syncstate;
struct berval syncUUID = BER_BVNULL;
- struct sync_cookie syncCookie = { BER_BVNULL };
- struct sync_cookie syncCookie_req = { BER_BVNULL };
+ struct sync_cookie syncCookie = { NULL };
+ struct sync_cookie syncCookie_req = { NULL };
struct berval cookie = BER_BVNULL;
int rc, err;
struct berval *psub;
Modifications *modlist = NULL;
- const char *text;
- int match;
+ int match, m;
struct timeval *tout_p = NULL;
struct timeval tout = { 0, 0 };
ber_init2( ber, NULL, LBER_USE_DER );
ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
- Debug( LDAP_DEBUG_TRACE, "=>do_syncrep2 rid %03ld\n", si->si_rid, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=>do_syncrep2 %s\n", si->si_ridtxt, 0, 0 );
psub = &si->si_be->be_nsuffix[0];
rctrlp = ldap_find_control( LDAP_CONTROL_SYNC_STATE, rctrls );
}
if ( rctrlp == NULL ) {
- Debug( LDAP_DEBUG_ANY, "do_syncrep2: rid %03ld "
+ Debug( LDAP_DEBUG_ANY, "do_syncrep2: %s "
"got search entry without "
- "Sync State control\n", si->si_rid, 0, 0 );
+ "Sync State control\n", si->si_ridtxt, 0, 0 );
rc = -1;
goto done;
}
/* FIXME: what if syncUUID is NULL or empty?
* (happens with back-sql...) */
if ( BER_BVISEMPTY( &syncUUID ) ) {
- Debug( LDAP_DEBUG_ANY, "do_syncrep2: rid %03ld "
- "got empty syncUUID\n", si->si_rid, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "do_syncrep2: %s "
+ "got empty syncUUID\n", si->si_ridtxt, 0, 0 );
ldap_controls_free( rctrls );
rc = -1;
goto done;
if ( si->si_syncdata && si->si_logstate == SYNCLOG_LOGGING ) {
modlist = NULL;
if ( ( rc = syncrepl_message_to_op( si, op, msg ) ) == LDAP_SUCCESS &&
- !BER_BVISNULL( &syncCookie.ctxcsn ) )
+ syncCookie.ctxcsn )
{
rc = syncrepl_updateCookie( si, op, psub, &syncCookie );
}
&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 ) )
+ syncstate, &syncUUID ) ) == LDAP_SUCCESS &&
+ syncCookie.ctxcsn )
{
rc = syncrepl_updateCookie( si, op, psub, &syncCookie );
}
case LDAP_RES_SEARCH_REFERENCE:
Debug( LDAP_DEBUG_ANY,
- "do_syncrep2: rid %03ld reference received error\n",
- si->si_rid, 0, 0 );
+ "do_syncrep2: %s reference received error\n",
+ si->si_ridtxt, 0, 0 );
break;
case LDAP_RES_SEARCH_RESULT:
Debug( LDAP_DEBUG_SYNC,
- "do_syncrep2: rid %03ld LDAP_RES_SEARCH_RESULT\n",
- si->si_rid, 0, 0 );
+ "do_syncrep2: %s LDAP_RES_SEARCH_RESULT\n",
+ si->si_ridtxt, 0, 0 );
ldap_parse_result( si->si_ld, msg, &err, NULL, NULL, NULL,
&rctrls, 0 );
#ifdef LDAP_X_SYNC_REFRESH_REQUIRED
}
ber_scanf( ber, /*"{"*/ "}" );
}
- if ( BER_BVISNULL( &syncCookie_req.ctxcsn ) ) {
- match = -1;
- } else if ( BER_BVISNULL( &syncCookie.ctxcsn ) ) {
+ if ( !syncCookie.ctxcsn ) {
match = 1;
+ } else if ( !syncCookie_req.ctxcsn ) {
+ match = -1;
+ m = 0;
} else {
- value_match( &match, slap_schema.si_ad_entryCSN,
- slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
- SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
- &syncCookie_req.ctxcsn, &syncCookie.ctxcsn,
- &text );
+ match = compare_csns( &syncCookie_req, &syncCookie, &m );
}
if ( rctrls ) {
ldap_controls_free( rctrls );
if ( refreshDeletes == 0 && match < 0 &&
err == LDAP_SUCCESS )
{
- syncrepl_del_nonpresent( op, si, NULL, &syncCookie.ctxcsn );
+ syncrepl_del_nonpresent( op, si, NULL,
+ &syncCookie.ctxcsn[m] );
} else {
avl_free( si->si_presentlist, avl_ber_bvfree );
si->si_presentlist = NULL;
}
}
- if ( !BER_BVISNULL( &syncCookie.ctxcsn ) &&
- match < 0 && err == LDAP_SUCCESS )
+ if ( syncCookie.ctxcsn && match < 0 && err == LDAP_SUCCESS )
{
rc = syncrepl_updateCookie( si, op, psub, &syncCookie );
}
ber_tag_t tag;
case LDAP_TAG_SYNC_NEW_COOKIE:
Debug( LDAP_DEBUG_SYNC,
- "do_syncrep2: rid %03ld %s - %s\n",
- si->si_rid,
+ "do_syncrep2: %s %s - %s\n",
+ si->si_ridtxt,
"LDAP_RES_INTERMEDIATE",
"NEW_COOKIE" );
ber_scanf( ber, "tm", &tag, &cookie );
case LDAP_TAG_SYNC_REFRESH_DELETE:
case LDAP_TAG_SYNC_REFRESH_PRESENT:
Debug( LDAP_DEBUG_SYNC,
- "do_syncrep2: rid %03ld %s - %s\n",
- si->si_rid,
+ "do_syncrep2: %s %s - %s\n",
+ si->si_ridtxt,
"LDAP_RES_INTERMEDIATE",
si_tag == LDAP_TAG_SYNC_REFRESH_PRESENT ?
"REFRESH_PRESENT" : "REFRESH_DELETE" );
break;
case LDAP_TAG_SYNC_ID_SET:
Debug( LDAP_DEBUG_SYNC,
- "do_syncrep2: rid %03ld %s - %s\n",
- si->si_rid,
+ "do_syncrep2: %s %s - %s\n",
+ si->si_ridtxt,
"LDAP_RES_INTERMEDIATE",
"SYNC_ID_SET" );
ber_scanf( ber, "t{" /*"}"*/, &tag );
if ( !BER_BVISNULL( &syncCookie.octet_str ) )
{
slap_parse_sync_cookie( &syncCookie, NULL );
+ compare_csns( &syncCookie_req, &syncCookie, &m );
}
}
if ( ber_peek_tag( ber, &len ) ==
ber_scanf( ber, /*"{"*/ "}" );
if ( refreshDeletes ) {
syncrepl_del_nonpresent( op, si, syncUUIDs,
- &syncCookie.ctxcsn );
+ &syncCookie.ctxcsn[m] );
ber_bvarray_free_x( syncUUIDs, op->o_tmpmemctx );
} else {
int i;
break;
default:
Debug( LDAP_DEBUG_ANY,
- "do_syncrep2: rid %03ld unknown syncinfo tag (%ld)\n",
- si->si_rid, (long) si_tag, 0 );
+ "do_syncrep2: %s unknown syncinfo tag (%ld)\n",
+ si->si_ridtxt, (long) si_tag, 0 );
ldap_memfree( retoid );
ber_bvfree( retdata );
continue;
}
- if ( BER_BVISNULL( &syncCookie_req.ctxcsn ) ) {
- match = -1;
- } else if ( BER_BVISNULL( &syncCookie.ctxcsn ) ) {
+ if ( !syncCookie.ctxcsn ) {
match = 1;
+ } else if ( !syncCookie_req.ctxcsn ) {
+ match = -1;
+ m = 0;
} else {
- value_match( &match, slap_schema.si_ad_entryCSN,
- slap_schema.si_ad_entryCSN->ad_type->sat_ordering,
- SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
- &syncCookie_req.ctxcsn,
- &syncCookie.ctxcsn, &text );
+ match = compare_csns( &syncCookie_req, &syncCookie, &m );
}
if ( match < 0 ) {
if ( si->si_refreshPresent == 1 ) {
- syncrepl_del_nonpresent( op, si, NULL, &syncCookie.ctxcsn );
+ syncrepl_del_nonpresent( op, si, NULL,
+ &syncCookie.ctxcsn[m] );
}
- if ( !BER_BVISNULL( &syncCookie.ctxcsn ) )
+ if ( syncCookie.ctxcsn )
{
rc = syncrepl_updateCookie( si, op, psub, &syncCookie);
}
break;
} else {
- Debug( LDAP_DEBUG_ANY, "do_syncrep2: rid %03ld "
+ Debug( LDAP_DEBUG_ANY, "do_syncrep2: %s "
"unknown intermediate response (%d)\n",
- si->si_rid, rc, 0 );
+ si->si_ridtxt, rc, 0 );
ldap_memfree( retoid );
ber_bvfree( retdata );
break;
break;
default:
- Debug( LDAP_DEBUG_ANY, "do_syncrep2: rid %03ld "
- "unknown message\n", si->si_rid, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "do_syncrep2: %s "
+ "unknown message\n", si->si_ridtxt, 0, 0 );
break;
}
errstr = ldap_err2string( rc );
Debug( LDAP_DEBUG_ANY,
- "do_syncrep2: rid %03ld %s\n", si->si_rid, errstr, 0 );
+ "do_syncrep2: %s %s\n", si->si_ridtxt, errstr, 0 );
}
done:
int i, defer = 1;
Backend *be;
- Debug( LDAP_DEBUG_TRACE, "=>do_syncrepl rid %03ld\n", si->si_rid, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=>do_syncrepl %s\n", si->si_ridtxt, 0, 0 );
if ( si == NULL )
return NULL;
if ( !si->si_schemachecking )
op->o_no_schema_check = 1;
+ /* If we're glued, send writes through the glue parent */
+ if ( !si->si_wbe ) {
+ if ( SLAP_GLUE_SUBORDINATE( be )) {
+ si->si_wbe = select_backend( &be->be_nsuffix[0], 0, 1 );
+ } else {
+ si->si_wbe = be;
+ }
+ }
+
/* Establish session, do search */
if ( !si->si_ld ) {
si->si_refreshDelete = 0;
goto reload;
}
+ /* We got deleted while running on cn=config */
+ if ( !si->si_ctype ) {
+ if ( si->si_conn_setup )
+ dostop = 1;
+ rc = -1;
+ }
+
if ( abs(si->si_type) == LDAP_SYNC_REFRESH_AND_PERSIST ) {
/* If we succeeded, enable the connection for further listening.
* If we failed, tear down the connection and reschedule.
break;
}
- if ( !si->si_retrynum || si->si_retrynum[i] == RETRYNUM_TAIL ) {
+ if ( !si->si_ctype
+ || !si->si_retrynum || si->si_retrynum[i] == RETRYNUM_TAIL ) {
ldap_pvt_runqueue_remove( &slapd_rq, rtask );
} else if ( RETRYNUM_VALID( si->si_retrynum[i] ) ) {
if ( si->si_retrynum[i] > 0 )
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
ldap_pvt_thread_mutex_unlock( &si->si_mutex );
+ /* Do final delete cleanup */
+ if ( !si->si_ctype ) {
+ cookie_state *cs = NULL;
+ syncinfo_t **sip;
+
+ cs = be->be_syncinfo->si_cookieState;
+ for ( sip = &be->be_syncinfo; *sip != si; sip = &(*sip)->si_next );
+ *sip = si->si_next;
+ syncinfo_free( si, 0 );
+ if ( !be->be_syncinfo ) {
+ SLAP_DBFLAGS( be ) &= ~(SLAP_DBFLAG_SHADOW|SLAP_DBFLAG_SYNC_SHADOW);
+ if ( cs ) {
+ ch_free( cs->cs_sids );
+ ber_bvarray_free( cs->cs_vals );
+ ldap_pvt_thread_mutex_destroy( &cs->cs_mutex );
+ ch_free( cs );
+ }
+ }
+ }
return NULL;
}
int rc, deleteOldRdn = 0, freeReqDn = 0;
if ( ldap_msgtype( msg ) != LDAP_RES_SEARCH_ENTRY ) {
- Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: rid %03ld "
+ Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: %s "
"Message type should be entry (%d)",
- si->si_rid, ldap_msgtype( msg ), 0 );
+ si->si_ridtxt, ldap_msgtype( msg ), 0 );
return -1;
}
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
- "syncrepl_message_to_op: rid %03ld dn get failed (%d)",
- si->si_rid, rc, 0 );
+ "syncrepl_message_to_op: %s dn get failed (%d)",
+ si->si_ridtxt, rc, 0 );
return rc;
}
op->o_tag = LBER_DEFAULT;
+ op->o_bd = si->si_wbe;
while (( rc = ldap_get_attribute_ber( si->si_ld, msg, ber, &bv, &bvals ) )
== LDAP_SUCCESS ) {
int i = verb_to_mask( bvals[0].bv_val, modops );
if ( i < 0 ) {
Debug( LDAP_DEBUG_ANY,
- "syncrepl_message_to_op: rid %03ld unknown op %s",
- si->si_rid, bvals[0].bv_val, 0 );
+ "syncrepl_message_to_op: %s unknown op %s",
+ si->si_ridtxt, bvals[0].bv_val, 0 );
ch_free( bvals );
rc = -1;
goto done;
rc = slap_mods_check( op, modlist, &text, txtbuf, textlen, NULL );
if ( rc != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: rid %03ld "
+ Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: %s "
"mods check (%s)\n",
- si->si_rid, text, 0 );
+ si->si_ridtxt, text, 0 );
goto done;
}
freeReqDn = 0;
rc = slap_mods2entry( modlist, &op->ora_e, 1, 0, &text, txtbuf, textlen);
if( rc != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: rid %03ld "
+ Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_op: %s "
"mods2entry (%s)\n",
- si->si_rid, text, 0 );
+ si->si_ridtxt, text, 0 );
} else {
rc = op->o_bd->be_add( op, &rs );
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_message_to_op: rid %03ld be_add %s (%d)\n",
- si->si_rid, op->o_req_dn.bv_val, rc );
+ "syncrepl_message_to_op: %s be_add %s (%d)\n",
+ si->si_ridtxt, op->o_req_dn.bv_val, rc );
}
if ( e == op->ora_e )
be_entry_release_w( op, op->ora_e );
} else {
op->orm_modlist = modlist;
+ op->o_bd = si->si_wbe;
rc = op->o_bd->be_modify( op, &rs );
+ modlist = op->orm_modlist;
Debug( rc ? LDAP_DEBUG_ANY : LDAP_DEBUG_SYNC,
- "syncrepl_message_to_op: rid %03ld be_modify %s (%d)\n",
- si->si_rid, op->o_req_dn.bv_val, rc );
+ "syncrepl_message_to_op: %s be_modify %s (%d)\n",
+ si->si_ridtxt, op->o_req_dn.bv_val, rc );
+ op->o_bd = si->si_be;
}
break;
case LDAP_REQ_MODRDN:
rc = op->o_bd->be_modrdn( op, &rs );
slap_mods_free( op->orr_modlist, 1 );
Debug( rc ? LDAP_DEBUG_ANY : LDAP_DEBUG_SYNC,
- "syncrepl_message_to_op: rid %03ld be_modrdn %s (%d)\n",
- si->si_rid, op->o_req_dn.bv_val, rc );
+ "syncrepl_message_to_op: %s be_modrdn %s (%d)\n",
+ si->si_ridtxt, op->o_req_dn.bv_val, rc );
break;
case LDAP_REQ_DELETE:
rc = op->o_bd->be_delete( op, &rs );
Debug( rc ? LDAP_DEBUG_ANY : LDAP_DEBUG_SYNC,
- "syncrepl_message_to_op: rid %03ld be_delete %s (%d)\n",
- si->si_rid, op->o_req_dn.bv_val, rc );
+ "syncrepl_message_to_op: %s be_delete %s (%d)\n",
+ si->si_ridtxt, op->o_req_dn.bv_val, rc );
break;
}
done:
slap_graduate_commit_csn( op );
+ op->o_bd = si->si_be;
op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
BER_BVZERO( &op->o_csn );
if ( modlist ) {
size_t textlen = sizeof txtbuf;
struct berval bdn = BER_BVNULL, dn, ndn;
- int rc;
+ int rc, is_ctx;
*modlist = NULL;
if ( ldap_msgtype( msg ) != LDAP_RES_SEARCH_ENTRY ) {
- Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: rid %03ld "
+ Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: %s "
"Message type should be entry (%d)",
- si->si_rid, ldap_msgtype( msg ), 0 );
+ si->si_ridtxt, ldap_msgtype( msg ), 0 );
return -1;
}
rc = ldap_get_dn_ber( si->si_ld, msg, &ber, &bdn );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
- "syncrepl_message_to_entry: rid %03ld dn get failed (%d)",
- si->si_rid, rc, 0 );
+ "syncrepl_message_to_entry: %s dn get failed (%d)",
+ si->si_ridtxt, rc, 0 );
return rc;
}
}
if ( entry == NULL ) {
- rc = -1;
- goto done;
+ return -1;
}
dnPrettyNormal( NULL, &bdn, &dn, &ndn, op->o_tmpmemctx );
slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
slap_sl_free( dn.bv_val, op->o_tmpmemctx );
+ is_ctx = dn_match( &op->o_req_ndn, &op->o_bd->be_nsuffix[0] );
+
e = entry_alloc();
e->e_name = op->o_req_dn;
e->e_nname = op->o_req_ndn;
break;
}
+ /* Drop all updates to the contextCSN of the context entry
+ * (ITS#4622, etc.)
+ */
+ if ( is_ctx && !strcasecmp( tmp.sml_type.bv_val,
+ slap_schema.si_ad_contextCSN->ad_cname.bv_val )) {
+ ber_bvarray_free( tmp.sml_values );
+ continue;
+ }
+
mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
mod->sml_op = LDAP_MOD_REPLACE;
}
if ( *modlist == NULL ) {
- Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: rid %03ld no attributes\n",
- si->si_rid, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: %s no attributes\n",
+ si->si_ridtxt, 0, 0 );
rc = -1;
goto done;
}
rc = slap_mods_check( op, *modlist, &text, txtbuf, textlen, NULL );
if ( rc != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: rid %03ld mods check (%s)\n",
- si->si_rid, text, 0 );
+ Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: %s mods check (%s)\n",
+ si->si_ridtxt, text, 0 );
goto done;
}
rc = slap_mods2entry( *modlist, &e, 1, 1, &text, txtbuf, textlen);
if( rc != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: rid %03ld mods2entry (%s)\n",
- si->si_rid, text, 0 );
+ Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: %s mods2entry (%s)\n",
+ si->si_ridtxt, text, 0 );
}
done:
e = NULL;
}
}
- *entry = e;
+ if ( entry )
+ *entry = e;
return rc;
}
Entry* entry,
Modifications** modlist,
int syncstate,
- struct berval* syncUUID,
- struct sync_cookie* syncCookie_req,
- struct berval* syncCSN )
+ struct berval* syncUUID )
{
Backend *be = op->o_bd;
slap_callback cb = { NULL, NULL, NULL, NULL };
switch( syncstate ) {
case LDAP_SYNC_PRESENT:
- Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: rid %03ld %s\n",
- si->si_rid,
+ Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: %s %s\n",
+ si->si_ridtxt,
"LDAP_RES_SEARCH_ENTRY(LDAP_SYNC_PRESENT)", 0 );
break;
case LDAP_SYNC_ADD:
- Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: rid %03ld %s\n",
- si->si_rid,
+ Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: %s %s\n",
+ si->si_ridtxt,
"LDAP_RES_SEARCH_ENTRY(LDAP_SYNC_ADD)", 0 );
break;
case LDAP_SYNC_DELETE:
- Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: rid %03ld %s\n",
- si->si_rid,
+ Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: %s %s\n",
+ si->si_ridtxt,
"LDAP_RES_SEARCH_ENTRY(LDAP_SYNC_DELETE)", 0 );
break;
case LDAP_SYNC_MODIFY:
- Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: rid %03ld %s\n",
- si->si_rid,
+ Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: %s %s\n",
+ si->si_ridtxt,
"LDAP_RES_SEARCH_ENTRY(LDAP_SYNC_MODIFY)", 0 );
break;
default:
- Debug( LDAP_DEBUG_ANY, "syncrepl_entry: rid %03ld %s\n",
- si->si_rid,
+ Debug( LDAP_DEBUG_ANY, "syncrepl_entry: %s %s\n",
+ si->si_ridtxt,
"LDAP_RES_SEARCH_ENTRY(UNKNOWN syncstate)", 0 );
}
ava.aa_value = *syncUUID;
if ( syncuuid_bv ) {
- Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: rid %03ld inserted UUID %s\n",
- si->si_rid, syncUUID_strrep.bv_val, 0 );
+ Debug( LDAP_DEBUG_SYNC, "syncrepl_entry: %s inserted UUID %s\n",
+ si->si_ridtxt, syncUUID_strrep.bv_val, 0 );
}
op->ors_filter = &f;
if ( limits_check( op, &rs_search ) == 0 ) {
rc = be->be_search( op, &rs_search );
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_entry: rid %03ld be_search (%d)\n",
- si->si_rid, rc, 0 );
+ "syncrepl_entry: %s be_search (%d)\n",
+ si->si_ridtxt, rc, 0 );
}
if ( !BER_BVISNULL( &op->ors_filterstr ) ) {
if ( entry && !BER_BVISNULL( &entry->e_name ) ) {
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_entry: rid %03ld %s\n",
- si->si_rid, entry->e_name.bv_val, 0 );
+ "syncrepl_entry: %s %s\n",
+ si->si_ridtxt, entry->e_name.bv_val, 0 );
} else {
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_entry: rid %03ld %s\n",
- si->si_rid, dni.dn.bv_val ? dni.dn.bv_val : "(null)", 0 );
- }
-
- /* Don't save the contextCSN on the inooming context entry,
- * we'll write it when syncrepl_updateCookie eventually
- * gets called. (ITS#4622)
- */
- if ( syncstate == LDAP_SYNC_ADD && dn_match( &entry->e_nname,
- &be->be_nsuffix[0] ) )
- {
- Attribute *a, **ap;
- for ( ap = &entry->e_attrs; *ap; ap=&(*ap)->a_next ) {
- a = *ap;
- if ( a->a_desc == slap_schema.si_ad_contextCSN ) {
- *ap = a->a_next;
- attr_free( a );
- break;
- }
- }
+ "syncrepl_entry: %s %s\n",
+ si->si_ridtxt, dni.dn.bv_val ? dni.dn.bv_val : "(null)", 0 );
}
slap_op_time( &op->o_time, &op->o_tincr );
op->o_req_ndn = entry->e_nname;
op->o_tag = LDAP_REQ_ADD;
op->ora_e = entry;
+ op->o_bd = si->si_wbe;
- rc = be->be_add( op, &rs_add );
+ rc = op->o_bd->be_add( op, &rs_add );
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_entry: rid %03ld be_add (%d)\n",
- si->si_rid, rc, 0 );
+ "syncrepl_entry: %s be_add (%d)\n",
+ si->si_ridtxt, rc, 0 );
switch ( rs_add.sr_err ) {
case LDAP_SUCCESS:
if ( op->ora_e == entry ) {
SlapReply rs2 = { 0 };
slap_callback cb2 = { 0 };
+ op2.o_bd = be;
op2.o_tag = LDAP_REQ_SEARCH;
op2.o_req_dn = entry->e_name;
op2.o_req_ndn = entry->e_nname;
default:
Debug( LDAP_DEBUG_ANY,
- "syncrepl_entry: rid %03ld be_add failed (%d)\n",
- si->si_rid, rs_add.sr_err, 0 );
+ "syncrepl_entry: %s be_add failed (%d)\n",
+ si->si_ridtxt, rs_add.sr_err, 0 );
break;
}
+ op->o_bd = be;
goto done;
}
/* FALLTHRU */
}
}
}
- rc = be->be_modrdn( op, &rs_modify );
+ op->o_bd = si->si_wbe;
+ rc = op->o_bd->be_modrdn( op, &rs_modify );
op->o_tmpfree( op->orr_nnewrdn.bv_val, op->o_tmpmemctx );
op->o_tmpfree( op->orr_newrdn.bv_val, op->o_tmpmemctx );
slap_mods_free( op->orr_modlist, 1 );
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_entry: rid %03ld be_modrdn (%d)\n",
- si->si_rid, rc, 0 );
+ "syncrepl_entry: %s be_modrdn (%d)\n",
+ si->si_ridtxt, rc, 0 );
+ op->o_bd = be;
goto done;
}
if ( dni.mods ) {
op->o_tag = LDAP_REQ_MODIFY;
op->orm_modlist = dni.mods;
op->orm_no_opattrs = 1;
+ op->o_bd = si->si_wbe;
- rc = be->be_modify( op, &rs_modify );
+ rc = op->o_bd->be_modify( op, &rs_modify );
slap_mods_free( op->orm_modlist, 1 );
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_entry: rid %03ld be_modify (%d)\n",
- si->si_rid, rc, 0 );
+ "syncrepl_entry: %s be_modify (%d)\n",
+ si->si_ridtxt, rc, 0 );
if ( rs_modify.sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
- "syncrepl_entry: rid %03ld be_modify failed (%d)\n",
- si->si_rid, rs_modify.sr_err, 0 );
+ "syncrepl_entry: %s be_modify failed (%d)\n",
+ si->si_ridtxt, rs_modify.sr_err, 0 );
}
+ op->o_bd = be;
+ } else {
+ Debug( LDAP_DEBUG_SYNC,
+ "syncrepl_entry: %s entry unchanged, ignored (%s)\n",
+ si->si_ridtxt, op->o_req_dn.bv_val, 0 );
}
goto done;
case LDAP_SYNC_DELETE :
op->o_req_dn = dni.dn;
op->o_req_ndn = dni.ndn;
op->o_tag = LDAP_REQ_DELETE;
- rc = be->be_delete( op, &rs_delete );
+ op->o_bd = si->si_wbe;
+ rc = op->o_bd->be_delete( op, &rs_delete );
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_entry: rid %03ld be_delete (%d)\n",
- si->si_rid, rc, 0 );
+ "syncrepl_entry: %s be_delete (%d)\n",
+ si->si_ridtxt, rc, 0 );
while ( rs_delete.sr_err == LDAP_SUCCESS
&& op->o_delete_glue_parent ) {
op->o_delete_glue_parent = 0;
- if ( !be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
+ if ( !be_issuffix( be, &op->o_req_ndn ) ) {
slap_callback cb = { NULL };
cb.sc_response = slap_null_cb;
dnParent( &op->o_req_ndn, &pdn );
break;
}
}
+ op->o_bd = be;
}
goto done;
default :
Debug( LDAP_DEBUG_ANY,
- "syncrepl_entry: rid %03ld unknown syncstate\n", si->si_rid, 0, 0 );
+ "syncrepl_entry: %s unknown syncstate\n", si->si_ridtxt, 0, 0 );
goto done;
}
if ( cookiecsn && !BER_BVISNULL( cookiecsn ) ) {
csn = *cookiecsn;
} else {
- csn = si->si_syncCookie.ctxcsn;
+ csn = si->si_syncCookie.ctxcsn[0];
}
+ op->o_bd = si->si_wbe;
slap_queue_csn( op, &csn );
np_list = LDAP_LIST_FIRST( &si->si_nonpresentlist );
op->o_req_ndn = *np_prev->npe_nname;
rc = op->o_bd->be_delete( op, &rs_delete );
Debug( LDAP_DEBUG_SYNC,
- "syncrepl_del_nonpresent: rid %03ld be_delete %s (%d)\n",
- si->si_rid, op->o_req_dn.bv_val, rc );
+ "syncrepl_del_nonpresent: %s be_delete %s (%d)\n",
+ si->si_ridtxt, op->o_req_dn.bv_val, rc );
if ( rs_delete.sr_err == LDAP_NOT_ALLOWED_ON_NONLEAF ) {
Modifications mod1, mod2;
op->o_tag = LDAP_REQ_MODIFY;
op->orm_modlist = &mod1;
- rc = be->be_modify( op, &rs_modify );
+ rc = op->o_bd->be_modify( op, &rs_modify );
if ( mod2.sml_next ) slap_mods_free( mod2.sml_next, 1 );
}
while ( rs_delete.sr_err == LDAP_SUCCESS &&
op->o_delete_glue_parent ) {
op->o_delete_glue_parent = 0;
- if ( !be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
+ if ( !be_issuffix( be, &op->o_req_ndn ) ) {
slap_callback cb = { NULL };
cb.sc_response = slap_null_cb;
dnParent( &op->o_req_ndn, &pdn );
}
slap_graduate_commit_csn( op );
+ op->o_bd = be;
op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
BER_BVZERO( &op->o_csn );
struct sync_cookie *syncCookie )
{
Backend *be = op->o_bd;
- Modifications mod = { { 0 } };
- struct berval vals[ 2 ];
+ Modifications mod[2];
+ struct berval first = BER_BVNULL;
- int rc, flags;
+ int rc, i, j;
slap_callback cb = { NULL };
SlapReply rs_modify = {REP_RESULT};
- 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] = syncCookie->ctxcsn;
- BER_BVZERO( &vals[1] );
-
- slap_queue_csn( op, &syncCookie->ctxcsn );
+ mod[0].sml_op = LDAP_MOD_DELETE;
+ mod[0].sml_desc = slap_schema.si_ad_contextCSN;
+ mod[0].sml_type = mod[0].sml_desc->ad_cname;
+ mod[0].sml_values = NULL;
+ mod[0].sml_nvalues = NULL;
+ mod[0].sml_next = &mod[1];
+
+ mod[1].sml_op = LDAP_MOD_ADD;
+ mod[1].sml_desc = slap_schema.si_ad_contextCSN;
+ mod[1].sml_type = mod[0].sml_desc->ad_cname;
+ mod[1].sml_values = NULL;
+ mod[1].sml_nvalues = NULL;
+ mod[1].sml_next = NULL;
+
+ ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex );
+
+ for ( i=0; i<syncCookie->numcsns; i++ ) {
+ for ( j=0; j<si->si_cookieState->cs_num; j++ ) {
+ if ( syncCookie->sids[i] != si->si_cookieState->cs_sids[j] )
+ continue;
+ if ( ber_bvcmp( &syncCookie->ctxcsn[i],
+ &si->si_cookieState->cs_vals[j] ) > 0 ) {
+ ber_bvarray_add_x( &mod[0].sml_values,
+ &si->si_cookieState->cs_vals[j], op->o_tmpmemctx );
+ ber_bvarray_add_x( &mod[1].sml_values,
+ &syncCookie->ctxcsn[i], op->o_tmpmemctx );
+ if ( BER_BVISNULL( &first ))
+ first = syncCookie->ctxcsn[i];
+ }
+ break;
+ }
+ /* there was no match for this SID, it's a new CSN */
+ if ( j == si->si_cookieState->cs_num ) {
+ ber_bvarray_add_x( &mod[1].sml_values,
+ &syncCookie->ctxcsn[i], op->o_tmpmemctx );
+ if ( BER_BVISNULL( &first ))
+ first = syncCookie->ctxcsn[i];
+ }
+ }
+ op->o_bd = si->si_wbe;
+ slap_queue_csn( op, &first );
op->o_tag = LDAP_REQ_MODIFY;
- assert( si->si_rid < 1000 );
-
cb.sc_response = null_callback;
cb.sc_private = si;
/* update contextCSN */
op->o_msgid = SLAP_SYNC_UPDATE_MSGID;
- op->orm_modlist = &mod;
- flags = SLAP_DBFLAGS( op->o_bd );
- SLAP_DBFLAGS( op->o_bd ) |= SLAP_DBFLAG_NOLASTMOD;
- rc = be->be_modify( op, &rs_modify );
- SLAP_DBFLAGS( op->o_bd ) = flags;
+
+ if ( mod[0].sml_values )
+ op->orm_modlist = mod;
+ else
+ op->orm_modlist = &mod[1];
+
+ op->orm_no_opattrs = 1;
+ rc = op->o_bd->be_modify( op, &rs_modify );
op->o_msgid = 0;
if ( rs_modify.sr_err == LDAP_SUCCESS ) {
slap_sync_cookie_free( &si->si_syncCookie, 0 );
slap_dup_sync_cookie( &si->si_syncCookie, syncCookie );
+ /* If we replaced any old values */
+ if ( mod[0].sml_values ) {
+ for ( i=0; !BER_BVISNULL( &mod[0].sml_values[i] ); i++ ) {
+ for ( j=0; j<si->si_cookieState->cs_num; j++ ) {
+ if ( mod[0].sml_values[i].bv_val !=
+ si->si_cookieState->cs_vals[j].bv_val )
+ continue;
+ ber_bvreplace( &si->si_cookieState->cs_vals[j],
+ &mod[1].sml_values[i] );
+ break;
+ }
+ }
+ } else {
+ /* Else we just added */
+ si->si_cookieState->cs_num += syncCookie->numcsns;
+ value_add( &si->si_cookieState->cs_vals, syncCookie->ctxcsn );
+ free( si->si_cookieState->cs_sids );
+ si->si_cookieState->cs_sids = slap_parse_csn_sids(
+ si->si_cookieState->cs_vals, si->si_cookieState->cs_num, NULL );
+ }
+
+ si->si_cookieState->cs_age++;
+ si->si_cookieAge = si->si_cookieState->cs_age;
} else {
Debug( LDAP_DEBUG_ANY,
- "syncrepl_updateCookie: rid %03ld be_modify failed (%d)\n",
- si->si_rid, rs_modify.sr_err, 0 );
+ "syncrepl_updateCookie: %s be_modify failed (%d)\n",
+ si->si_ridtxt, rs_modify.sr_err, 0 );
}
+ ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
slap_graduate_commit_csn( op );
+ op->o_bd = be;
op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
BER_BVZERO( &op->o_csn );
- if ( mod.sml_next ) slap_mods_free( mod.sml_next, 1 );
+ if ( mod[1].sml_next ) slap_mods_free( mod[1].sml_next, 1 );
+ op->o_tmpfree( mod[1].sml_values, op->o_tmpmemctx );
+ op->o_tmpfree( mod[0].sml_values, op->o_tmpmemctx );
return rc;
}
attr_cmp( Operation *op, Attribute *old, Attribute *new,
Modifications ***mret, Modifications ***mcur )
{
- int i, j, doadd = 0;
+ int i, j;
Modifications *mod, **modtail;
modtail = *mret;
}
/* advance to next element */
mod = **mcur;
- if ( i != j ) {
- **mcur = mod->sml_next;
- *modtail = mod;
- modtail = &mod->sml_next;
- } else {
- if ( mod )
+ if ( mod ) {
+ if ( i != j ) {
+ **mcur = mod->sml_next;
+ *modtail = mod;
+ modtail = &mod->sml_next;
+ } else {
*mcur = &mod->sml_next;
+ }
}
*mret = modtail;
}
if ( dni->new_entry ) {
Modifications **modtail, **ml;
Attribute *old, *new;
- int i;
+ int i, is_ctx;
+
+ is_ctx = dn_match( &rs->sr_entry->e_nname,
+ &op->o_bd->be_nsuffix[0] );
/* Did the DN change?
*/
modtail = &dni->mods;
ml = dni->modlist;
+ /* Make sure new entry is actually newer than old entry */
+ old = attr_find( rs->sr_entry->e_attrs,
+ slap_schema.si_ad_entryCSN );
+ new = attr_find( dni->new_entry->e_attrs,
+ slap_schema.si_ad_entryCSN );
+ if ( new && old && ber_bvcmp( &old->a_vals[0],
+ &new->a_vals[0] ) >= 0 ) {
+ Debug( LDAP_DEBUG_SYNC,
+ "dn_callback : new entry is older than ours "
+ "%s ours %s, new %s\n",
+ rs->sr_entry->e_name.bv_val,
+ old->a_vals[0].bv_val,
+ new->a_vals[0].bv_val );
+ return LDAP_SUCCESS;
+ }
+
/* We assume that attributes are saved in the same order
* in the remote and local databases. So if we walk through
* the attributeDescriptions one by one they should match in
for ( old = rs->sr_entry->e_attrs, new = dni->new_entry->e_attrs;
old && new; )
{
-#if 1
+ /* If we've seen this before, use its mod now */
if ( new->a_flags & SLAP_ATTR_IXADD ) {
+ attr_cmp( op, NULL, new, &modtail, &ml );
new = new->a_next;
continue;
}
-#endif
+ /* Skip contextCSN */
+ if ( is_ctx && old->a_desc ==
+ slap_schema.si_ad_contextCSN ) {
+ old = old->a_next;
+ continue;
+ }
+
if ( old->a_desc != new->a_desc ) {
Modifications *mod;
Attribute *tmp;
old = old->a_next;
continue;
}
- attr_cmp( op, old, new, &modtail, &ml );
+ /* kludge - always update modifiersName so that it
+ * stays co-located with the other mod opattrs. But only
+ * if we know there are other valid mods.
+ */
+ if ( old->a_desc == slap_schema.si_ad_modifiersName &&
+ dni->mods )
+ attr_cmp( op, NULL, new, &modtail, &ml );
+ else
+ attr_cmp( op, old, new, &modtail, &ml );
new = new->a_next;
old = old->a_next;
}
} else if ( rs->sr_type == REP_SEARCH ) {
if ( !( si->si_refreshDelete & NP_DELETE_ONE ) ) {
- char buf[sizeof("000 not")];
+ char buf[sizeof("rid=000 not")];
a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryUUID );
}
if ( slap_debug & LDAP_DEBUG_SYNC ) {
- sprintf( buf, "%03ld %s", si->si_rid,
+ sprintf( buf, "%s %s", si->si_ridtxt,
present_uuid ? "got" : "not" );
}
- Debug( LDAP_DEBUG_SYNC, "nonpresent_callback: rid %s UUID %s, dn %s\n",
+ Debug( LDAP_DEBUG_SYNC, "nonpresent_callback: %s UUID %s, dn %s\n",
buf, a ? a->a_vals[0].bv_val : "<missing>", rs->sr_entry->e_name.bv_val );
if ( a == NULL ) return 0;
}
void
-syncinfo_free( syncinfo_t *sie )
+syncinfo_free( syncinfo_t *sie, int free_all )
{
- if ( sie->si_ld ) {
- if ( sie->si_conn_setup ) {
- ber_socket_t s;
- ldap_get_option( sie->si_ld, LDAP_OPT_DESC, &s );
- connection_client_stop( s );
- sie->si_conn_setup = 0;
- }
- ldap_unbind_ext( sie->si_ld, NULL, NULL );
- }
+ syncinfo_t *si_next;
- /* 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 );
+ if ( free_all && sie->si_cookieState ) {
+ ch_free( sie->si_cookieState->cs_sids );
+ ber_bvarray_free( sie->si_cookieState->cs_vals );
+ ldap_pvt_thread_mutex_destroy( &sie->si_cookieState->cs_mutex );
+ ch_free( sie->si_cookieState );
}
+ do {
+ si_next = sie->si_next;
- ldap_pvt_thread_mutex_destroy( &sie->si_mutex );
-
- bindconf_free( &sie->si_bindconf );
-
- if ( sie->si_filterstr.bv_val ) {
- ch_free( sie->si_filterstr.bv_val );
- }
- if ( sie->si_logfilterstr.bv_val ) {
- ch_free( sie->si_logfilterstr.bv_val );
- }
- if ( sie->si_base.bv_val ) {
- ch_free( sie->si_base.bv_val );
- }
- if ( sie->si_logbase.bv_val ) {
- ch_free( sie->si_logbase.bv_val );
- }
- if ( sie->si_attrs ) {
- int i = 0;
- while ( sie->si_attrs[i] != NULL ) {
- ch_free( sie->si_attrs[i] );
- i++;
+ if ( sie->si_ld ) {
+ if ( sie->si_conn_setup ) {
+ ber_socket_t s;
+ ldap_get_option( sie->si_ld, LDAP_OPT_DESC, &s );
+ connection_client_stop( s );
+ sie->si_conn_setup = 0;
+ }
+ ldap_unbind_ext( sie->si_ld, NULL, NULL );
}
- ch_free( sie->si_attrs );
- }
- if ( sie->si_exattrs ) {
- int i = 0;
- while ( sie->si_exattrs[i] != NULL ) {
- ch_free( sie->si_exattrs[i] );
- i++;
+
+ /* 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 );
}
- ch_free( sie->si_exattrs );
- }
- if ( sie->si_anlist ) {
- int i = 0;
- while ( sie->si_anlist[i].an_name.bv_val != NULL ) {
- ch_free( sie->si_anlist[i].an_name.bv_val );
- i++;
+
+ ldap_pvt_thread_mutex_destroy( &sie->si_mutex );
+
+ bindconf_free( &sie->si_bindconf );
+
+ if ( sie->si_filterstr.bv_val ) {
+ ch_free( sie->si_filterstr.bv_val );
}
- ch_free( sie->si_anlist );
- }
- if ( sie->si_exanlist ) {
- int i = 0;
- while ( sie->si_exanlist[i].an_name.bv_val != NULL ) {
- ch_free( sie->si_exanlist[i].an_name.bv_val );
- i++;
+ if ( sie->si_logfilterstr.bv_val ) {
+ ch_free( sie->si_logfilterstr.bv_val );
}
- ch_free( sie->si_exanlist );
- }
- if ( sie->si_retryinterval ) {
- ch_free( sie->si_retryinterval );
- }
- if ( sie->si_retrynum ) {
- ch_free( sie->si_retrynum );
- }
- if ( sie->si_retrynum_init ) {
- ch_free( sie->si_retrynum_init );
- }
- slap_sync_cookie_free( &sie->si_syncCookie, 0 );
- if ( sie->si_presentlist ) {
- avl_free( sie->si_presentlist, avl_ber_bvfree );
- }
- while ( !LDAP_LIST_EMPTY( &sie->si_nonpresentlist ) ) {
- struct nonpresent_entry* npe;
- npe = LDAP_LIST_FIRST( &sie->si_nonpresentlist );
- LDAP_LIST_REMOVE( npe, npe_link );
- if ( npe->npe_name ) {
- if ( npe->npe_name->bv_val ) {
- ch_free( npe->npe_name->bv_val );
+ if ( sie->si_base.bv_val ) {
+ ch_free( sie->si_base.bv_val );
+ }
+ if ( sie->si_logbase.bv_val ) {
+ ch_free( sie->si_logbase.bv_val );
+ }
+ if ( sie->si_attrs ) {
+ int i = 0;
+ while ( sie->si_attrs[i] != NULL ) {
+ ch_free( sie->si_attrs[i] );
+ i++;
}
- ch_free( npe->npe_name );
+ ch_free( sie->si_attrs );
}
- if ( npe->npe_nname ) {
- if ( npe->npe_nname->bv_val ) {
- ch_free( npe->npe_nname->bv_val );
+ if ( sie->si_exattrs ) {
+ int i = 0;
+ while ( sie->si_exattrs[i] != NULL ) {
+ ch_free( sie->si_exattrs[i] );
+ i++;
}
- ch_free( npe->npe_nname );
+ ch_free( sie->si_exattrs );
}
- ch_free( npe );
- }
- ch_free( sie );
+ if ( sie->si_anlist ) {
+ int i = 0;
+ while ( sie->si_anlist[i].an_name.bv_val != NULL ) {
+ ch_free( sie->si_anlist[i].an_name.bv_val );
+ i++;
+ }
+ ch_free( sie->si_anlist );
+ }
+ if ( sie->si_exanlist ) {
+ int i = 0;
+ while ( sie->si_exanlist[i].an_name.bv_val != NULL ) {
+ ch_free( sie->si_exanlist[i].an_name.bv_val );
+ i++;
+ }
+ ch_free( sie->si_exanlist );
+ }
+ if ( sie->si_retryinterval ) {
+ ch_free( sie->si_retryinterval );
+ }
+ if ( sie->si_retrynum ) {
+ ch_free( sie->si_retrynum );
+ }
+ if ( sie->si_retrynum_init ) {
+ ch_free( sie->si_retrynum_init );
+ }
+ slap_sync_cookie_free( &sie->si_syncCookie, 0 );
+ if ( sie->si_presentlist ) {
+ avl_free( sie->si_presentlist, avl_ber_bvfree );
+ }
+ while ( !LDAP_LIST_EMPTY( &sie->si_nonpresentlist ) ) {
+ struct nonpresent_entry* npe;
+ npe = LDAP_LIST_FIRST( &sie->si_nonpresentlist );
+ LDAP_LIST_REMOVE( npe, npe_link );
+ if ( npe->npe_name ) {
+ if ( npe->npe_name->bv_val ) {
+ ch_free( npe->npe_name->bv_val );
+ }
+ ch_free( npe->npe_name );
+ }
+ if ( npe->npe_nname ) {
+ if ( npe->npe_nname->bv_val ) {
+ ch_free( npe->npe_nname->bv_val );
+ }
+ ch_free( npe->npe_nname );
+ }
+ ch_free( npe );
+ }
+ ch_free( sie );
+ sie = si_next;
+ } while ( free_all && si_next );
}
#define SLIMITSTR "sizelimit"
#define TLIMITSTR "timelimit"
#define SYNCDATASTR "syncdata"
+#define LOGBASESTR "logbase"
+#define LOGFILTERSTR "logfilter"
/* FIXME: undocumented */
-#define LOGBASESTR "logbase"
-#define LOGFILTERSTR "logfilter"
-#define OLDAUTHCSTR "bindprincipal"
#define EXATTRSSTR "exattrs"
#define MANAGEDSAITSTR "manageDSAit"
-/* FIXME: unused */
-#define LASTMODSTR "lastmod"
-#define LMGENSTR "gen"
-#define LMNOSTR "no"
-#define LMREQSTR "req"
-#define SRVTABSTR "srvtab"
-#define SUFFIXSTR "suffix"
-
/* mandatory */
#define GOT_ID 0x0001
#define GOT_PROVIDER 0x0002
return -1;
}
si->si_rid = tmp;
+ sprintf( si->si_ridtxt, IDSTR "=%03d", si->si_rid );
gots |= GOT_ID;
} else if ( !strncasecmp( c->argv[ i ], PROVIDERSTR "=",
STRLENOF( PROVIDERSTR "=" ) ) )
Debug( LDAP_DEBUG_ANY,
"version %d incompatible with syncrepl\n",
si->si_bindconf.sb_version, 0, 0 );
- syncinfo_free( si );
+ syncinfo_free( si, 0 );
return 1;
}
init_syncrepl( si );
si->si_re = ldap_pvt_runqueue_insert( &slapd_rq,
si->si_interval, do_syncrepl, si, "do_syncrepl",
- c->be->be_suffix[0].bv_val );
+ si->si_ridtxt );
if ( si->si_re )
rc = config_sync_shadow( c ) ? -1 : 0;
else
#endif
if ( rc < 0 ) {
Debug( LDAP_DEBUG_ANY, "failed to add syncinfo\n", 0, 0, 0 );
- syncinfo_free( si );
+ syncinfo_free( si, 0 );
return 1;
} else {
Debug( LDAP_DEBUG_CONFIG,
if ( !si->si_schemachecking ) {
SLAP_DBFLAGS(c->be) |= SLAP_DBFLAG_NO_SCHEMA_CHECK;
}
+ if ( c->be->be_syncinfo ) {
+ si->si_cookieState = c->be->be_syncinfo->si_cookieState;
+ } else {
+ si->si_cookieState = ch_calloc( 1, sizeof( cookie_state ));
+ ldap_pvt_thread_mutex_init( &si->si_cookieState->cs_mutex );
+ }
+ si->si_next = c->be->be_syncinfo;
c->be->be_syncinfo = si;
return 0;
}
si->si_bindconf.sb_version = LDAP_VERSION3;
ptr = buf;
- ptr += snprintf( ptr, WHATSLEFT, IDSTR "=%03ld " PROVIDERSTR "=%s",
+ ptr += snprintf( ptr, WHATSLEFT, IDSTR "=%03d " PROVIDERSTR "=%s",
si->si_rid, si->si_bindconf.sb_uri.bv_val );
if ( ptr - buf >= sizeof( buf ) ) return;
if ( !BER_BVISNULL( &bc ) ) {
if (c->op == SLAP_CONFIG_EMIT) {
if ( c->be->be_syncinfo ) {
struct berval bv;
- syncrepl_unparse( c->be->be_syncinfo, &bv );
- ber_bvarray_add( &c->rvalue_vals, &bv );
+ syncinfo_t *si;
+
+ for ( si = c->be->be_syncinfo; si; si=si->si_next ) {
+ syncrepl_unparse( si, &bv );
+ ber_bvarray_add( &c->rvalue_vals, &bv );
+ }
return 0;
}
return 1;
} else if ( c->op == LDAP_MOD_DELETE ) {
+ cookie_state *cs = NULL;
if ( c->be->be_syncinfo ) {
- syncinfo_free( c->be->be_syncinfo );
- c->be->be_syncinfo = NULL;
+ syncinfo_t *si, **sip;
+ int i;
+
+ cs = c->be->be_syncinfo->si_cookieState;
+ for ( sip = &c->be->be_syncinfo, i=0; *sip; i++ ) {
+ si = *sip;
+ if ( c->valx == -1 || i == c->valx ) {
+ *sip = si->si_next;
+ /* If the task is currently active, we have to leave
+ * it running. It will exit on its own. This will only
+ * happen when running on the cn=config DB.
+ */
+ if ( si->si_re &&
+ ldap_pvt_runqueue_isrunning( &slapd_rq, si->si_re ) ) {
+ si->si_ctype = 0;
+ } else {
+ syncinfo_free( si, 0 );
+ }
+ if ( i == c->valx )
+ break;
+ } else {
+ sip = &si->si_next;
+ }
+ }
+ }
+ if ( !c->be->be_syncinfo ) {
+ SLAP_DBFLAGS( c->be ) &= ~(SLAP_DBFLAG_SHADOW|SLAP_DBFLAG_SYNC_SHADOW);
+ if ( cs ) {
+ ber_bvarray_free( cs->cs_vals );
+ ldap_pvt_thread_mutex_destroy( &cs->cs_mutex );
+ ch_free( cs );
+ }
}
- SLAP_DBFLAGS( c->be ) &= ~(SLAP_DBFLAG_SHADOW|SLAP_DBFLAG_SYNC_SHADOW);
return 0;
}
- if ( SLAP_SHADOW( c->be ) ) {
+ if ( SLAP_SLURP_SHADOW( c->be ) ) {
Debug(LDAP_DEBUG_ANY, "%s: "
"syncrepl: database already shadowed.\n",
c->log, 0, 0);