This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 1d4e83bf1c AMQ-9818 JournalCorruptionEofIndexRecoveryTest failing on
OutOfMemoryException (#1561)
1d4e83bf1c is described below
commit 1d4e83bf1cfbc64b95619e00be4e1826423e1b63
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Fri Dec 12 15:03:45 2025 +0100
AMQ-9818 JournalCorruptionEofIndexRecoveryTest failing on
OutOfMemoryException (#1561)
---
.../JournalCorruptionEofIndexRecoveryTest.java | 35 +++++++++++++++-------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git
a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java
b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java
index cebb182be7..2d5137b02d 100644
---
a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java
+++
b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java
@@ -222,7 +222,10 @@ public class JournalCorruptionEofIndexRecoveryTest {
DataFile dataFile = ((KahaDBPersistenceAdapter)
broker.getPersistenceAdapter()).getStore().getJournal().getFileMap().get(Integer.valueOf(location.getDataFileId()));
RecoverableRandomAccessFile randomAccessFile =
dataFile.openRandomAccessFile();
randomAccessFile.seek(location.getOffset());
- randomAccessFile.writeInt(Integer.MAX_VALUE);
+ // Use an invalid size well past the end of the data file to trigger
corruption handling without large allocation.
+ int bogusSize = ((KahaDBPersistenceAdapter)
broker.getPersistenceAdapter()).getStore().getJournal()
+ .getFileMap().get(location.getDataFileId()).getLength() * 10;
+ randomAccessFile.writeInt(bogusSize);
randomAccessFile.getChannel().force(true);
((KahaDBPersistenceAdapter)
broker.getPersistenceAdapter()).getStore().getJournal().close();
@@ -246,15 +249,26 @@ public class JournalCorruptionEofIndexRecoveryTest {
* throw new EOFException();
*/
if (event != null
- && event.getLevel() == Level.WARN
- && event.getMessage() != null
- && event.getMessage().getFormattedMessage() != null
- &&
event.getMessage().getFormattedMessage().contains("Cannot recover message
audit")
+ && event.getLevel() == Level.WARN
+ && event.getMessage() != null
+ && event.getMessage().getFormattedMessage() != null) {
+
+ final String msg =
event.getMessage().getFormattedMessage();
+
+ boolean auditCorruption =
+ msg.contains("Cannot recover message audit")
&& event.getThrown() != null
- && event.getThrown() instanceof EOFException
- && event.getThrown().getMessage() == null) {
+ && (event.getThrown() instanceof EOFException
+ || (event.getThrown() instanceof IOException
+ && event.getThrown().getMessage() != null
+ &&
event.getThrown().getMessage().contains("Invalid location size")));
- trappedExpectedLogMessage.set(true);
+ boolean dataFileCorruption =
+ msg.contains("DataFile:") && (msg.contains("Invalid
location size") || msg.contains("larger than expected"));
+
+ if (auditCorruption || dataFileCorruption) {
+ trappedExpectedLogMessage.set(true);
+ }
}
}
};
@@ -272,7 +286,7 @@ public class JournalCorruptionEofIndexRecoveryTest {
assertEquals("no missing message", 50,
broker.getAdminView().getTotalMessageCount());
assertEquals("Drain", 50, drainQueue(50));
assertEquals("no problem draining messages", 0,
broker.getAdminView().getTotalMessageCount());
- assertTrue("Did replay records on invalid location size",
trappedExpectedLogMessage.get());
+ assertTrue("Did not detect corruption via warning",
trappedExpectedLogMessage.get());
}
@Test
@@ -419,7 +433,8 @@ public class JournalCorruptionEofIndexRecoveryTest {
int pos = batchPositions.get(batchPositions.size() - 3);
LOG.info("corrupting checksum and size (to push it past eof) of batch
record at:" + id + "-" + pos);
randomAccessFile.seek(pos +
Journal.BATCH_CONTROL_RECORD_HEADER.length);
- randomAccessFile.writeInt(31 * 1024 * 1024);
+ // Use a bounded bogus size to trigger the corruption path without
exhausting heap on read.
+ randomAccessFile.writeInt(4 * 1024 * 1024);
randomAccessFile.writeLong(0l);
randomAccessFile.getChannel().force(true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
