[AMQ-8354] Fix the bug with resync on format exception.

amazon-mq · Jan 14, 2025 · 6707762 · 6707762
1 parent 8014360
commit 6707762
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSequencer.java b/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSequencer.java
@@ -201,10 +201,6 @@ void initialize() throws Exception {
     }
 
     void deinitialize() throws Exception {
-        if (!initialized.get()) {
-            return;
-        }
-
         logger.info("de-initializing replica sequencer");
 
         if (ackTaskRunner != null) {

diff --git a/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSourceBroker.java b/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSourceBroker.java
@@ -102,6 +102,9 @@ public void start(ReplicaRole role, boolean resync) throws Exception {
             replicaSequencer.initialize();
         } catch (ReplicaStorageFormatException e) {
             logger.warn("ReplicaSequenceStorage is in old format. Initiating the resyncronization.");
+            replicaSequencer.deinitialize();
+            removeReplicationQueues();
+            initQueueProvider();
             replicaResynchronizer.resynchronize(role, true);
             replicaSequencer.initialize();
         }