From b875ab3f7b327f797ec4532015e45da6ae3fff56 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 08 Apr 2014 09:09:25 +0000
Subject: [PATCH] Backport fix for OPENDJ-1354: replication threads BLOCKED in pendingChanges queue
---
opends/src/server/org/opends/server/replication/server/ServerHandler.java | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index c7efe83..9c165a8 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.server;
import java.io.IOException;
+
import java.util.List;
import java.util.Random;
import java.util.concurrent.Semaphore;
@@ -484,7 +485,7 @@
*/
public ReplicationServerDomain getDomain()
{
- return this.replicationServerDomain;
+ return replicationServerDomain;
}
/**
@@ -847,21 +848,45 @@
*
* @param msg The message to be processed.
*/
- public void process(RoutableMsg msg)
+ void process(RoutableMsg msg)
{
if (debugEnabled())
+ {
TRACER.debugInfo("In "
+ replicationServerDomain.getLocalRSMonitorInstanceName() + " "
+ this + " processes routable msg received:" + msg);
+ }
replicationServerDomain.process(msg, this);
}
/**
+ * Responds to a monitor request message.
+ *
+ * @param msg
+ * The monitor request message.
+ */
+ void processMonitorRequestMsg(MonitorRequestMsg msg)
+ {
+ replicationServerDomain.processMonitorRequestMsg(msg, this);
+ }
+
+ /**
+ * Responds to a monitor message.
+ *
+ * @param msg
+ * The monitor message.
+ */
+ void processMonitorMsg(MonitorMsg msg)
+ {
+ replicationServerDomain.processMonitorMsg(msg, this);
+ }
+
+ /**
* Processes a change time heartbeat msg.
*
* @param msg The message to be processed.
*/
- public void process(ChangeTimeHeartbeatMsg msg)
+ void process(ChangeTimeHeartbeatMsg msg)
{
if (debugEnabled())
TRACER.debugInfo("In "
@@ -925,15 +950,6 @@
}
/**
- * Sets the replication server domain associated.
- * @param rsd The provided replication server domain.
- */
- protected void setReplicationServerDomain(ReplicationServerDomain rsd)
- {
- this.replicationServerDomain = rsd;
- }
-
- /**
* Sets the window size when used when sending to the remote.
* @param size The provided window size.
*/
@@ -1179,7 +1195,7 @@
* Process a Ack message received.
* @param ack the message received.
*/
- public void processAck(AckMsg ack)
+ void processAck(AckMsg ack)
{
if (replicationServerDomain!=null)
replicationServerDomain.processAck(ack, this);
@@ -1200,7 +1216,7 @@
* Process a ResetGenerationIdMsg message received.
* @param msg the message received.
*/
- public void processResetGenId(ResetGenerationIdMsg msg)
+ void processResetGenId(ResetGenerationIdMsg msg)
{
if (replicationServerDomain!=null)
replicationServerDomain.resetGenerationId(this, msg);
--
Gitblit v1.10.0