From a5c5efbf8ca56c059709953f7fedb647dadaed06 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 27 May 2010 15:28:09 +0000
Subject: [PATCH] Fix for issues #3395 and #3998. The changes improves the replica initialization protocol, especially flow control and handling connection outage.
---
opends/src/server/org/opends/server/tasks/InitializeTargetTask.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java b/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
index 6940340..aa6eca6 100644
--- a/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
+++ b/opends/src/server/org/opends/server/tasks/InitializeTargetTask.java
@@ -22,11 +22,12 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tasks;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
+import org.opends.messages.Message;
import org.opends.messages.TaskMessages;
import org.opends.server.types.ResultCode;
@@ -35,6 +36,7 @@
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.core.DirectoryServer.getAttributeType;
import static org.opends.server.loggers.debug.DebugLogger.*;
+
import org.opends.server.loggers.debug.DebugTracer;
import java.util.List;
@@ -68,6 +70,13 @@
/**
* {@inheritDoc}
*/
+ public Message getDisplayName() {
+ return TaskMessages.INFO_TASK_INITIALIZE_TARGET_NAME.get();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
@Override public void initializeTask() throws DirectoryException
{
if (TaskState.isDone(getTaskState()))
@@ -117,9 +126,9 @@
protected TaskState runTask()
{
if (debugEnabled())
- {
- TRACER.debugInfo("DebugInfo" + "InitializeTarget Task/runTask ");
- }
+ TRACER.debugInfo("[IE] InitializeTargetTask is starting on domain: "+
+ domain.getServiceID());
+
try
{
domain.initializeRemote(target, this);
@@ -128,7 +137,6 @@
{
// This log will go to the task log message
MessageBuilder mb = new MessageBuilder();
- mb.append("Initialize Task stopped by error");
mb.append(de.getMessageObject());
logError(mb.toMessage());
--
Gitblit v1.10.0