From e131e3cef7357a2f5acdc3d86979b8c5486ca71b Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 20 Mar 2012 11:19:25 +0000
Subject: [PATCH] Fix OPENDJ-457: Sleeping replication threads prevent server from shutting down
---
opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java b/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
index 597a6d3..03ad1db 100644
--- a/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
+++ b/opends/src/server/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2012 ForgeRock AS
*/
package org.opends.server.replication.service;
@@ -35,6 +35,7 @@
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.protocol.ChangeTimeHeartbeatMsg;
import org.opends.server.replication.protocol.ProtocolSession;
+import org.opends.server.types.DebugLogLevel;
import org.opends.server.util.TimeThread;
import java.io.IOException;
@@ -111,27 +112,32 @@
session.publish(ctHeartbeatMsg);
}
- try
+ long sleepTime = session.getLastPublishTime() +
+ heartbeatInterval - now;
+ if (sleepTime <= 0)
{
- long sleepTime = session.getLastPublishTime() +
- heartbeatInterval - now;
- if (sleepTime <= 0)
- {
- sleepTime = heartbeatInterval;
- }
+ sleepTime = heartbeatInterval;
+ }
- synchronized (shutdownLock)
+ synchronized (shutdownLock)
+ {
+ if (!shutdown)
{
- if (!shutdown)
+ try
{
shutdownLock.wait(sleepTime);
}
+ catch (InterruptedException e)
+ {
+ // Server shutdown monitor may interrupt slow threads.
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+ shutdown = true;
+ }
}
}
- catch (InterruptedException e)
- {
- // Keep looping.
- }
}
}
catch (IOException e)
--
Gitblit v1.10.0