From 45eb21b1354b6925fc058f834f505a9699d1bbbe Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Wed, 10 Jun 2009 08:43:50 +0000
Subject: [PATCH] External Changelog - first step - related issues 495, 519
---
opends/src/server/org/opends/server/replication/server/ServerWriter.java | 48 +++++++++++++++++++-----------------------------
1 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerWriter.java b/opends/src/server/org/opends/server/replication/server/ServerWriter.java
index 90492e8..340983a 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerWriter.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.replication.server;
import org.opends.messages.Message;
@@ -58,7 +58,6 @@
private ProtocolSession session;
private ServerHandler handler;
private ReplicationServerDomain replicationServerDomain;
- private short serverId;
private short protocolVersion = -1;
/**
@@ -76,10 +75,10 @@
ServerHandler handler,
ReplicationServerDomain replicationServerDomain)
{
- super("Replication Writer for " + handler.toString() + " in RS " +
- replicationServerDomain.getReplicationServer().getServerId());
+ super("Replication Writer Thread for handler of " +
+ handler.toString() +
+ " in " + replicationServerDomain);
- this.serverId = serverId;
this.session = session;
this.handler = handler;
this.replicationServerDomain = replicationServerDomain;
@@ -94,16 +93,10 @@
*/
public void run()
{
+ Message errMessage = null;
if (debugEnabled())
{
- if (handler.isReplicationServer())
- {
- TRACER.debugInfo("Replication server writer starting " + serverId);
- }
- else
- {
- TRACER.debugInfo("LDAP server writer starting " + serverId);
- }
+ TRACER.debugInfo(this.getName() + " starting");
}
try
{
@@ -111,10 +104,14 @@
{
UpdateMsg update = replicationServerDomain.take(this.handler);
if (update == null)
+ {
+ errMessage = Message.raw(
+ "Connection closure: null update returned by domain.");
return; /* this connection is closing */
+ }
/* Ignore updates in some cases */
- if (handler.isLDAPserver())
+ if (handler.isDataServer())
{
/**
* Ignore updates to DS in bad BAD_GENID_STATUS or FULL_UPDATE_STATUS
@@ -184,6 +181,7 @@
", writer to " + this.handler.getMonitorInstanceName() +
" publishes msg=[" + update.toString() + "]"+
" refgenId=" + referenceGenerationId +
+ " isAssured=" + update.isAssured() +
" server=" + handler.getServerId() +
" generationId=" + handler.getGenerationId());
}
@@ -200,10 +198,10 @@
* The remote host has disconnected and this particular Tree is going to
* be removed, just ignore the exception and let the thread die as well
*/
- Message message = NOTE_SERVER_DISCONNECT.get(handler.toString(),
+ errMessage = NOTE_SERVER_DISCONNECT.get(handler.toString(),
Short.toString(replicationServerDomain.
getReplicationServer().getServerId()));
- logError(message);
+ logError(errMessage);
}
catch (SocketException e)
{
@@ -211,10 +209,10 @@
* The remote host has disconnected and this particular Tree is going to
* be removed, just ignore the exception and let the thread die as well
*/
- Message message = NOTE_SERVER_DISCONNECT.get(handler.toString(),
+ errMessage = NOTE_SERVER_DISCONNECT.get(handler.toString(),
Short.toString(replicationServerDomain.
getReplicationServer().getServerId()));
- logError(message);
+ logError(errMessage);
}
catch (Exception e)
{
@@ -222,9 +220,9 @@
* An unexpected error happened.
* Log an error and close the connection.
*/
- Message message = ERR_WRITER_UNEXPECTED_EXCEPTION.get(handler.toString() +
+ errMessage = ERR_WRITER_UNEXPECTED_EXCEPTION.get(handler.toString() +
" " + stackTraceToSingleLineString(e));
- logError(message);
+ logError(errMessage);
}
finally {
try
@@ -235,17 +233,9 @@
// Can't do much more : ignore
}
replicationServerDomain.stopServer(handler);
-
if (debugEnabled())
{
- if (handler.isReplicationServer())
- {
- TRACER.debugInfo("Replication server writer stopping " + serverId);
- }
- else
- {
- TRACER.debugInfo("LDAP server writer stopping " + serverId);
- }
+ TRACER.debugInfo(this.getName() + " stopped " + errMessage);
}
}
}
--
Gitblit v1.10.0