Attachment 310042 Details for Bug 450973 – diffs

[patch] diffs

diffs.bug450973 (text/plain), 3.29 KB, created by Rich Megginson on 2008-06-23 16:45:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-06-23 16:45:55 UTC

Size: 3.29 KB

patch

obsolete

>Index: bug450973/ldap/servers/plugins/replication/repl5_inc_protocol.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_inc_protocol.c,v
>retrieving revision 1.11
>diff -u -8 -r1.11 repl5_inc_protocol.c
>--- bug450973/ldap/servers/plugins/replication/repl5_inc_protocol.c	18 Oct 2007 00:08:31 -0000	1.11
>+++ bug450973/ldap/servers/plugins/replication/repl5_inc_protocol.c	23 Jun 2008 16:40:10 -0000
>@@ -289,16 +289,17 @@
> 		 * this is so we don't block here forever, and can stop this thread when
> 		 * the time comes. However, we do need to implement blocking with timeout
> 		 * semantics here instead.
> 		 */
> 
> 		while (!finished)
> 		{
> 			conres = conn_read_result_ex(conn, NULL, NULL, NULL, &message_id, 0);
>+			slapi_log_error(SLAPI_LOG_REPL, NULL, "repl5_inc_result_threadmain: read result for message_id %d\n", message_id);
> 			/* Timeout here means that we didn't block, not a real timeout */
> 			if (CONN_TIMEOUT == conres)
> 			{
> 				/* We need to a) check that the 'real' timeout hasn't expired and
> 				 * b) implement a backoff sleep to avoid spinning */
> 				/* Did the connection's timeout expire ? */
> 				time_now = time( NULL );
> 				if (conn_get_timeout(conn) <= ( time_now - start_time ))
>@@ -323,42 +324,45 @@
> 			} else
> 			{
> 				/* Something other than a timeout, so we exit the loop */
> 				break;
> 			}
> 		}
> 		if (conres != CONN_TIMEOUT)
> 		{
>+			int should_finish = 0;
> 			if (message_id) 
> 			{
> 				rd->last_message_id_received = message_id;
> 			}
> 			/* Handle any error etc */
> 
> 			/* Get the stored operation details from the queue, unless we timed out... */
> 			op = repl5_inc_pop_operation(rd);
> 			if (op) 
> 			{
> 				csn_str = op->csn_str;
> 				replica_id = op->replica_id;
> 				uniqueid = op->uniqueid;
> 			}
> 
> 			conn_get_error_ex(conn, &operation_code, &connection_error, &ldap_error_string);
>-			slapi_log_error(SLAPI_LOG_REPL, NULL, "repl5_inc_result_threadmain: result %d, %d, %d, %s\n", operation_code,connection_error,conres,ldap_error_string);
>-			rd->result = repl5_inc_update_from_op_result(rd->prp, conres, connection_error, csn_str, uniqueid, replica_id, &finished, &(rd->num_changes_sent));
>-			if (rd->result)
>+			slapi_log_error(SLAPI_LOG_REPL, NULL, "repl5_inc_result_threadmain: result %d, %d, %d, %d, %s\n", operation_code,connection_error,conres,message_id,ldap_error_string);
>+			rd->result = repl5_inc_update_from_op_result(rd->prp, conres, connection_error, csn_str, uniqueid, replica_id, &should_finish, &(rd->num_changes_sent));
>+			if (rd->result || should_finish)
> 			{
>-				slapi_log_error(SLAPI_LOG_REPL, NULL, "repl5_inc_result_threadmain: got op result %d\n", rd->result);
>+				slapi_log_error(SLAPI_LOG_REPL, NULL, "repl5_inc_result_threadmain: got op result %d should finish %d\n", rd->result, should_finish);
> 				/* If so then we need to take steps to abort the update process */
> 				PR_Lock(rd->lock);
> 				rd->abort = 1;
> 				PR_Unlock(rd->lock);
> 				/* We also need to log the error, including details stored from when the operation was sent */
>+				/* we cannot finish yet - we still need to waitfor the pending results, then
>+				   the main repl code will shut down this thread */
> 			}
> 		}
> 		/* Should we stop ? */
> 		PR_Lock(rd->lock);
> 		if (rd->stop_result_thread) 
> 		{
> 			finished = 1;
> 		}

Actions: View | Diff

Attachments on bug 450973: 310042 | 310060