From 69f502abd9219bf113a3b062d30068d699f79403 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Thu, 16 Jul 2026 05:16:04 +0000
Subject: [PATCH] [#735] Do not roll back a concurrently adopted generation ID on aborted handshake (#736)
---
opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
index b6429e9..a68f2d2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
@@ -13,6 +13,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC
*/
package org.opends.server.replication.server;
@@ -365,7 +366,6 @@
{
// initializations
localGenerationId = -1;
- oldGenerationId = -100;
// processes the ServerStart message received
boolean sessionInitiatorSSLEncryption =
@@ -395,7 +395,6 @@
lockDomainNoTimeout();
localGenerationId = replicationServerDomain.getGenerationId();
- oldGenerationId = localGenerationId;
if (replicationServerDomain.isAlreadyConnectedToDS(this))
{
@@ -601,7 +600,7 @@
// WARNING: Must be done before computing topo message to send
// to peer server as topo message must embed valid generation id
// for our server
- oldGenerationId = replicationServerDomain.changeGenerationId(generationId);
+ setDomainGenerationIdOnStart(generationId);
}
}
return startSessionMsg;
--
Gitblit v1.10.0