From cc98695069d613fb483650235920b70f1022f4d5 Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Thu, 29 Nov 2007 08:43:16 +0000
Subject: [PATCH] Fix #2630 dsrepl pre-external-initialization does not work with bin copy
---
opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index c7d71d1..391c238 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -203,8 +203,6 @@
private long generationId = -1;
private boolean generationIdSavedStatus = false;
- private long rejectedGenerationId = -1;
- private boolean requestedResetSinceLastStart = false;
/**
* This object is used to store the list of update currently being
@@ -901,29 +899,6 @@
ErrorMessage errorMsg = (ErrorMessage)msg;
logError(ERR_ERROR_MSG_RECEIVED.get(
errorMsg.getDetails()));
-
- if (errorMsg.getMsgID() == NOTE_RESET_GENERATION_ID.getId())
- {
- TRACER.debugInfo("requestedResetSinceLastStart=" +
- requestedResetSinceLastStart +
- "rejectedGenerationId=" + rejectedGenerationId);
-
- if (requestedResetSinceLastStart && (rejectedGenerationId>0))
- {
- // When the last generation presented was refused and we are
- // the 'reseter' server then restart automatically to become
- // the 'master'
- state.clear();
- rejectedGenerationId = -1;
- requestedResetSinceLastStart = false;
- broker.stop();
- broker.start(replicationServers);
- }
- }
- if (errorMsg.getMsgID() == NOTE_BAD_GENERATION_ID.getId())
- {
- rejectedGenerationId = generationId;
- }
}
}
else if (msg instanceof UpdateMessage)
@@ -2534,8 +2509,11 @@
*/
public void resetGenerationId(Long generationIdNewValue)
{
+ if (debugEnabled())
+ TRACER.debugInfo(
+ this.getName() + "resetGenerationId" + generationIdNewValue);
+
ResetGenerationId genIdMessage = null;
- requestedResetSinceLastStart = true;
if (generationIdNewValue == null)
{
genIdMessage = new ResetGenerationId(this.generationId);
@@ -3267,7 +3245,6 @@
baseDN.toNormalizedString(),
e.getLocalizedMessage()));
}
- rejectedGenerationId = -1;
if (debugEnabled())
TRACER.debugInfo(
--
Gitblit v1.10.0