From 9e1f377c4f21b899d16f4c62450c68691f4b42a8 Mon Sep 17 00:00:00 2001 From: Ludovic Poitou <ludovic.poitou@forgerock.com> Date: Thu, 20 Jun 2013 15:02:35 +0000 Subject: [PATCH] Fix for OPENDJ-846, Intermittent Replication failure. The issue was triggered by the mix of AssuredReplication and bad network conditions, which resulted in a deadlock between 2 RS, as both were blocked on writing to the TCP socket and not reading (because waiting on the write lock). The solution (more of a workaround) is to have another thread for sending data to the socket and have the reader and writer posting data to send to a queue that this new thread is polling. There are still potential deadlocks but they will occur much later, if the sendQueue gets full. The code needs more work post 2.6 to be fully non blocking, but the changes are enough for now to resolve the customer deadlock case. --- opends/src/server/org/opends/server/replication/protocol/package-info.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opends/src/server/org/opends/server/replication/protocol/package-info.java b/opends/src/server/org/opends/server/replication/protocol/package-info.java index 3d8fb2f..15c5a1d 100644 --- a/opends/src/server/org/opends/server/replication/protocol/package-info.java +++ b/opends/src/server/org/opends/server/replication/protocol/package-info.java @@ -23,6 +23,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions Copyright 2013 ForgeRock AS. */ @@ -35,8 +36,8 @@ * The main classes of this packages are : * <br> * <ul> - * <li><A HREF="SocketSession.html"><B>SocketSession</B></A> - * implements the ProtocolSession interface that is + * <li><A HREF="Session.html"><B>Session</B></A> + * implements the session and protocol that is * used by the replication server and the directory server to communicate. * This is done by using the innate encoding/decoding capabilities of the * ReplicationMessages objects. This class is used by both the -- Gitblit v1.10.0