Attachment 263531 Details for Bug 388021 – diffs

[patch] diffs

cvsdiffs (text/plain), 3.97 KB, created by Rich Megginson on 2007-11-19 15:11:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-11-19 15:11:00 UTC

Size: 3.97 KB

patch

obsolete

>Index: ldapserver/ldap/servers/plugins/replication/cl5_api.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v
>retrieving revision 1.20
>diff -u -8 -r1.20 cl5_api.c
>--- ldapserver/ldap/servers/plugins/replication/cl5_api.c	19 Oct 2007 02:09:24 -0000	1.20
>+++ ldapserver/ldap/servers/plugins/replication/cl5_api.c	19 Nov 2007 15:04:23 -0000
>@@ -5702,44 +5702,76 @@
> 		the consumer RUV will contain the last state of the supplier before migration,
> 		but the supplier will have an empty changelog, or the supplier changelog will
> 		not contain any entries within the consumer min and max CSN - also, since
> 		the purge RUV contains no CSNs, the changelog has never been purged
> 		ASSUMPTIONS - it is assumed that the supplier had no pending changes to send
> 		to any consumers; that is, we can assume that no changes were lost due to
> 		either changelog purging or database reload - bug# 603061 - richm@netscape.com
> 		*/
>-        if (rc == 0 || (rc == DB_NOTFOUND && !ruv_has_csns(file->purgeRUV)))
>+        if ((rc == DB_NOTFOUND) && !ruv_has_csns(file->purgeRUV))
>         {
>+            /* use the supplier min csn for the buffer start csn - we know
>+               this csn is in our changelog */
>+            slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, 
>+                            "%s: CSN %s not found and no purging, probably a reinit\n",
>+                            agmt_name, csnStr);
>+            if ((RUV_SUCCESS == ruv_get_min_csn(supplierRuv, &startCSN)) &&
>+                startCSN)
>+            { /* must now free startCSN */
>+                csn_as_string(startCSN, PR_FALSE, csnStr); 
>+                slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, 
>+                                "%s: Will try to use supplier min CSN %s to load changelog\n",
>+                                agmt_name, csnStr);
>+                rc = clcache_load_buffer (clcache, startCSN, DB_SET);
>+            }
>+            else
>+            {
>+                slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, 
>+                                "%s: Could not get the min csn from the supplier RUV\n",
>+                                agmt_name);
>+            }
>+        }
>+
>+        if (rc == 0) {
>             haveChanges = PR_TRUE;
>             rc = CL5_SUCCESS;
>-			slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, 
>+            slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, 
>                             "%s: CSN %s found, position set for replay\n", agmt_name, csnStr);
>+            if (startCSN != csns[i]) {
>+                csn_free(&startCSN);
>+            }
>             break;
>         }
>         else if (rc == DB_NOTFOUND)  /* entry not found */
>         {
>             /* check whether this csn should be present */
>             rc = _cl5CheckMissingCSN (startCSN, supplierRuv, file);
>+            if (startCSN != csns[i]) {
>+                csn_free(&startCSN);
>+            }
>             if (rc == CL5_MISSING_DATA)  /* we should have had the change but we don't */
>             {
> 				slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, 
>                                 "%s: CSN %s not found, seems to be missing\n", agmt_name, csnStr);
>                 break;
>             }
>             else /* we are not as up to date or we purged */
>             {
> 				slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, 
>                                 "%s: CSN %s not found, we aren't as up to date, or we purged\n", 
> 						agmt_name, csnStr);
>                 continue;
>             } 
>         }
>         else
>         {
>+            if (startCSN != csns[i]) {
>+                csn_free(&startCSN);
>+            }
> 
>             /* db error */
> 			slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, 
>                             "%s: Failed to retrieve change with CSN %s; db error - %d %s\n", 
>                             agmt_name, csnStr, rc, db_strerror(rc));
>             rc = CL5_DB_ERROR;
>             break;
>         }

Actions: View | Diff

Attachments on bug 388021: 263531 | 263701