From 5bf287bc9f92c5b0893e1dade87453be153d07c1 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Dec 2013 16:30:13 +0000
Subject: [PATCH] OPENDJ-1172 Deadlock between replication threads during shutdown
---
opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
index a4539a7..885af0a 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
@@ -614,30 +614,8 @@
*/
void shutdownOnException(DatabaseException e)
{
- innerShutdownOnException(e);
- }
-
- /**
- * Shuts down replication when an unexpected changelog exception occurs. Note
- * that we do not expect lock timeouts or txn timeouts because the replication
- * databases are deadlock free, thus all operations should complete
- * eventually.
- *
- * @param e
- * The unexpected changelog exception.
- */
- void shutdownOnException(ChangelogException e)
- {
- innerShutdownOnException(e);
- }
-
- private void innerShutdownOnException(Exception e)
- {
- MessageBuilder mb = new MessageBuilder();
- mb.append(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR.get());
- mb.append(". ");
- mb.append(stackTraceToSingleLineString(e));
- logError(mb.toMessage());
+ logError(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR
+ .get(stackTraceToSingleLineString(e)));
replicationServer.shutdown();
}
--
Gitblit v1.10.0