ARTEMIS-4298 and ARTEMIS-4215 Fixing duplicated entries on historyFiles on journalRetention during a replication
This is Fixing BackupSyncJournalTest::testReplicationDuringSync ARTEMIS-4215 introduced a failure on the testsuite. However the failure is non related to the Buffer itself. it introduced a race that unveiled ARTEMIS-4298.
This commit is contained in:
parent
e7de2c7001
commit
c5be8b72c1
|
@ -2933,6 +2933,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
|
|||
|
||||
fileFactory.stop();
|
||||
|
||||
historyPendingFiles.clear();
|
||||
|
||||
currentFile = null;
|
||||
} finally {
|
||||
journalLock.writeLock().unlock();
|
||||
|
|
|
@ -1716,6 +1716,7 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
|
|||
|
||||
|
||||
if (config.getJournalRetentionLocation() != null) {
|
||||
messageJournal.getFileFactory().start();
|
||||
messageJournal.setHistoryFolder(config.getJournalRetentionLocation(), config.getJournalRetentionMaxBytes(), config.getJournalRetentionPeriod());
|
||||
}
|
||||
messageJournal.start();
|
||||
|
|
Loading…
Reference in New Issue