Skip to content

AMQ-9824 - Cleanup code in KahaDB classes #1567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cshannon wants to merge 2 commits into
base: main
Choose a base branch
from
+683 −927
Open

AMQ-9824 - Cleanup code in KahaDB classes #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
581f380
AMQ-9824 - Cleanup code in KahaDB classes
cshannon Dec 18, 2025
6cd775e
Merge branch 'main' into AMQ-9824
cshannon Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
827 changes: 365 additions & 462 deletions activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
View file
Open in desktop

Large diffs are not rendered by default.

711 changes: 285 additions & 426 deletions activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 17 additions & 20 deletions ...src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,31 +442,28 @@ private void corruptBatchEndEof(int id) throws Exception{
private void corruptOrderIndex(final int num, final int size) throws Exception {
//This is because of AMQ-6097, now that the MessageOrderIndex stores the size in the Location,
//we need to corrupt that value as well
final KahaDBStore kahaDbStore = (KahaDBStore) ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore();
kahaDbStore.indexLock.writeLock().lock();
final KahaDBStore kahaDbStore = ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore();
kahaDbStore.indexLock.lock();
try {
kahaDbStore.pageFile.tx().execute(new Transaction.Closure<IOException>() {
@Override
public void execute(Transaction tx) throws IOException {
StoredDestination sd = kahaDbStore.getStoredDestination(kahaDbStore.convert(
(ActiveMQQueue)destination), tx);
int i = 1;
for (Iterator<Entry<Long, MessageKeys>> iterator = sd.orderIndex.iterator(tx); iterator.hasNext();) {
Entry<Long, MessageKeys> entry = iterator.next();
if (i == num) {
//change the size value to the wrong size
sd.orderIndex.get(tx, entry.getKey());
MessageKeys messageKeys = entry.getValue();
messageKeys.location.setSize(size);
sd.orderIndex.put(tx, sd.orderIndex.lastGetPriority(), entry.getKey(), messageKeys);
break;
}
i++;
kahaDbStore.pageFile.tx().execute(tx -> {
StoredDestination sd = kahaDbStore.getStoredDestination(kahaDbStore.convert(
(ActiveMQQueue)destination), tx);
int i = 1;
for (Iterator<Entry<Long, MessageKeys>> iterator = sd.orderIndex.iterator(tx); iterator.hasNext();) {
Entry<Long, MessageKeys> entry = iterator.next();
if (i == num) {
//change the size value to the wrong size
sd.orderIndex.get(tx, entry.getKey());
MessageKeys messageKeys = entry.getValue();
messageKeys.location.setSize(size);
sd.orderIndex.put(tx, sd.orderIndex.lastGetPriority(), entry.getKey(), messageKeys);
break;
}
i++;
}
});
} finally {
kahaDbStore.indexLock.writeLock().unlock();
kahaDbStore.indexLock.unlock();
}
}

Expand Down
23 changes: 10 additions & 13 deletions ...-store/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreOpenWireVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,22 +164,19 @@ private void corruptIndex() throws IOException {

//blow up the index
try {
store.indexLock.writeLock().lock();
pageFile.tx().execute(new Transaction.Closure<IOException>() {
@Override
public void execute(Transaction tx) throws IOException {
for (Iterator<Entry<String, StoredDestination>> iterator = metadata.destinations.iterator(tx); iterator
.hasNext();) {
Entry<String, StoredDestination> entry = iterator.next();
entry.getValue().orderIndex.nextMessageId = -100;
entry.getValue().orderIndex.defaultPriorityIndex.clear(tx);
entry.getValue().orderIndex.lowPriorityIndex.clear(tx);
entry.getValue().orderIndex.highPriorityIndex.clear(tx);
}
store.indexLock.lock();
pageFile.tx().execute(tx -> {
for (Iterator<Entry<String, StoredDestination>> iterator = metadata.destinations.iterator(tx); iterator
.hasNext();) {
Entry<String, StoredDestination> entry = iterator.next();
entry.getValue().orderIndex.nextMessageId = -100;
entry.getValue().orderIndex.defaultPriorityIndex.clear(tx);
entry.getValue().orderIndex.lowPriorityIndex.clear(tx);
entry.getValue().orderIndex.highPriorityIndex.clear(tx);
}
});
} finally {
store.indexLock.writeLock().unlock();
store.indexLock.unlock();
}
}

Expand Down
4 changes: 2 additions & 2 deletions activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2982Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ public void forceCleanup() throws IOException {

public int getFileMapSize() throws IOException {
// ensure save memory publishing, use the right lock
indexLock.readLock().lock();
indexLock.lock();
try {
return getJournal().getFileMap().size();
} finally {
indexLock.readLock().unlock();
indexLock.unlock();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2983Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ public void forceCleanup() throws IOException {

public int getFileMapSize() throws IOException {
// ensure save memory publishing, use the right lock
indexLock.readLock().lock();
indexLock.lock();
try {
return getJournal().getFileMap().size();
} finally {
indexLock.readLock().unlock();
indexLock.unlock();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void testLocationIndexMatchesOrderIndex() throws Exception {

//Iterate over the order index and add up the size of the messages to compare
//to the location index
kahaDbStore.indexLock.readLock().lock();
kahaDbStore.indexLock.lock();
try {
long size = kahaDbStore.pageFile.tx().execute(new Transaction.CallableClosure<Long, IOException>() {
@Override
Expand All @@ -79,7 +79,7 @@ public Long execute(Transaction tx) throws IOException {
assertEquals("Order index size values don't match message size",
size, messageStore.getMessageSize());
} finally {
kahaDbStore.indexLock.readLock().unlock();
kahaDbStore.indexLock.unlock();
}
}

Expand Down