[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_inc_protocol.c, 1.13, 1.14 windows_tot_protocol.c, 1.10, 1.11

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18050

Modified Files:
	windows_inc_protocol.c windows_tot_protocol.c 
Log Message:
Resolves: 170560
Summary: Make sync total update deal with an empty changelog.



Index: windows_inc_protocol.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_inc_protocol.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- windows_inc_protocol.c	10 Nov 2006 23:45:17 -0000	1.13
+++ windows_inc_protocol.c	26 Sep 2007 05:43:34 -0000	1.14
@@ -1128,12 +1128,23 @@
 	slapi_operation_parameters op;
 	int return_value;
 	int rc;
+	int set_mincsn = 0;
 	CL5ReplayIterator *changelog_iterator = NULL;
 	RUV *current_ruv = ruv_dup(remote_update_vector);
+	CSN *mincsn = NULL;
 
 	LDAPDebug( LDAP_DEBUG_TRACE, "=> send_updates\n", 0, 0, 0 );
 
 	*num_changes_sent = 0;
+
+	/* Check if the min csn is set in our RUV to see if we need to set it below. */
+	ruv_get_min_csn(current_ruv, &mincsn);
+	if (!mincsn) {
+		set_mincsn = 1;
+	} else {
+		csn_free(&mincsn);
+	}
+
 	/*
 	 * Iterate over the changelog. Retrieve each update,
 	 * construct an appropriate LDAP operation,
@@ -1341,7 +1352,22 @@
 				}
 				if (mark_record_done)
 				{
-					/* bring the consumers (AD) RUV up to date */
+					/* If this is the very first change being sent,
+					 * it's possible that we haven't set a min csn
+					 * in the RUV yet.  This is possible because we
+					 * simply copy the supplier RUV during the total
+					 * update process.  The supplier RUV will not have
+					 * a min or max csn set if no changes have ever
+					 * been written to it's changelog.  We need to set
+					 * the min csn for the consumer here to prevent
+					 * problems with further sync operations. */
+					if (set_mincsn) {
+						ruv_set_min_csn(current_ruv, entry.op->csn, NULL);
+						set_mincsn = 0;
+					}
+
+					/* Bring the consumers (AD) RUV up to date.
+					 * This sets the max csn. */
 					ruv_force_csn_update(current_ruv, entry.op->csn);
 				}
 				break;
@@ -1637,14 +1663,7 @@
 		}
 		else
 		{
-			/* Check for the case where part of the RUV remote is missing */
-			if (ruv_has_both_csns(remote_ruv))
-			{
-				return_value = EXAMINE_RUV_OK;
-			} else 
-			{
-				return_value = EXAMINE_RUV_PRISTINE_REPLICA;
-			}
+			return_value = EXAMINE_RUV_OK;
 		}
 		slapi_ch_free((void**)&remote_gen);
 		slapi_ch_free((void**)&local_gen);


Index: windows_tot_protocol.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_tot_protocol.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- windows_tot_protocol.c	4 Sep 2007 15:45:57 -0000	1.10
+++ windows_tot_protocol.c	26 Sep 2007 05:43:34 -0000	1.11
@@ -142,14 +142,6 @@
 		goto done;    
     }
 
-	/* Get the current replica RUV.
-	 * If the total update succeeds, we will set the consumer RUV to this value.
-	 */
-	replica = object_get_data(prp->replica_object);
-	local_ruv_obj = replica_get_ruv (replica);
-	starting_ruv = ruv_dup((RUV*)  object_get_data ( local_ruv_obj ));
-	object_release (local_ruv_obj);
-	
 	agmt_set_last_init_status(prp->agmt, 0, 0, "Total schema update in progress");
 	remote_schema_csn = agmt_get_consumer_schema_csn ( prp->agmt );
 
@@ -165,6 +157,18 @@
 	cookie_has_more = windows_private_dirsync_has_more(prp->agmt);	
 	
 	windows_private_save_dirsync_cookie(prp->agmt);
+
+	/* If we got a change from dirsync, we should have a good RUV
+	 * that has a min & max value.  If no change was generated,
+	 * the RUV will have NULL min and max csns.  We deal with
+	 * updating these values when we process the first change in
+	 * the incremental sync protocol ( send_updates() ).  We will
+	 * use this value for setting the consumer RUV if the total
+	 * update succeeds. */
+        replica = object_get_data(prp->replica_object);
+        local_ruv_obj = replica_get_ruv (replica);
+        starting_ruv = ruv_dup((RUV*)  object_get_data ( local_ruv_obj ));
+        object_release (local_ruv_obj);
 	
 
 	/* send everything */