Skip to content

ARTEMIS-6362 A send refused after its duplicate id check leaves the duplicate id cache as it was #6883

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
grepjava wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ARTEMIS-6362 A send refused after its duplicate id check leaves the duplicate id cache as it was #6883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 24 additions & 3 deletions .../main/java/org/apache/activemq/artemis/core/postoffice/impl/InMemoryDuplicateIDCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ final class InMemoryDuplicateIDCache implements DuplicateIDCache {

private final Map<ByteArray, Integer> cache = new ConcurrentHashMap<>();

// Ids of sends whose transaction is still open, with how many: they count as duplicates, but take no slot until
// the send commits, so a send that fails leaves the ids before it in the cache
private final Map<ByteArray, Integer> inFlight = new ConcurrentHashMap<>();

private final SimpleString address;

private final List<ByteArray> ids;
Expand Down Expand Up @@ -123,7 +127,7 @@ public boolean contains(final byte[] duplID) {
}

private boolean contains(final ByteArray id) {
boolean contains = cache.containsKey(id);
boolean contains = cache.containsKey(id) || inFlight.containsKey(id);

if (logger.isTraceEnabled()) {
if (contains) {
Expand Down Expand Up @@ -170,7 +174,7 @@ private synchronized void addToCache(final ByteArray holder, final Transaction t
}

if (instantAdd) {
addToCacheInMemory(holder);
reserve(holder);
tx.addOperation(new AddDuplicateIDOperation(holder, false));
} else {
// For a tx, it's important that the entry is not added to the cache until commit
Expand All @@ -185,6 +189,14 @@ public void load(final Transaction tx, final byte[] duplID) {
tx.addOperation(new AddDuplicateIDOperation(new ByteArray(duplID), true));
}

private void reserve(final ByteArray holder) {
inFlight.merge(holder, 1, Integer::sum);
}

private void release(final ByteArray holder) {
inFlight.computeIfPresent(holder, (id, count) -> count == 1 ? null : count - 1);
}

private synchronized void addToCacheInMemory(final ByteArray holder) {
if (logger.isTraceEnabled()) {
logger.trace("address = {} adding {}", address, describeID(holder.bytes));
Expand Down Expand Up @@ -266,6 +278,15 @@ private void process() {
}
}

@Override
public void beforeCommit(final Transaction tx) throws Exception {
// The send was routed: its id takes its slot now, as a send outside a transaction does
if (!afterCommit) {
process();
release(id);
}
}

@Override
public void afterCommit(final Transaction tx) {
if (afterCommit) {
Expand All @@ -276,7 +297,7 @@ public void afterCommit(final Transaction tx) {
@Override
public void beforeRollback(Transaction tx) throws Exception {
if (!afterCommit) {
deleteFromCache(id);
release(id);
}
}

Expand Down
27 changes: 24 additions & 3 deletions ...ain/java/org/apache/activemq/artemis/core/postoffice/impl/PersistentDuplicateIDCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ final class PersistentDuplicateIDCache implements DuplicateIDCache {

private final Map<ByteArray, Integer> cache = new ConcurrentHashMap<>();

// Ids of sends whose transaction is still open, with how many: they count as duplicates, but take no slot until
// the send commits, so a send that fails leaves the ids before it in the cache
private final Map<ByteArray, Integer> inFlight = new ConcurrentHashMap<>();

private final SimpleString address;

private final List<ObjLongPair<ByteArray>> ids;
Expand Down Expand Up @@ -201,7 +205,7 @@ public boolean contains(final byte[] duplID) {
}

private boolean contains(final ByteArray duplID) {
final boolean contains = cache.containsKey(duplID);
final boolean contains = cache.containsKey(duplID) || inFlight.containsKey(duplID);
if (contains) {
if (logger.isTraceEnabled()) {
logger.trace("address = {} found a duplicate {}", address, describeID(duplID.bytes));
Expand Down Expand Up @@ -258,7 +262,7 @@ private synchronized void addToCache(final ByteArray holder,
}

if (instantAdd) {
addToCacheInMemory(holder, recordID);
reserve(holder);
tx.addOperation(new AddDuplicateIDOperation(holder, recordID, false));
} else {
// For a tx, it's important that the entry is not added to the cache until commit
Expand All @@ -273,6 +277,14 @@ public void load(final Transaction tx, final byte[] duplID) {
tx.addOperation(new AddDuplicateIDOperation(new ByteArray(duplID), tx.getID(), true));
}

private void reserve(final ByteArray holder) {
inFlight.merge(holder, 1, Integer::sum);
}

private void release(final ByteArray holder) {
inFlight.computeIfPresent(holder, (id, count) -> count == 1 ? null : count - 1);
}

private synchronized void addToCacheInMemory(final ByteArray holder, final long recordID) {
Objects.requireNonNull(holder, "holder must be not null");
if (recordID < 0) {
Expand Down Expand Up @@ -394,6 +406,15 @@ private void process() {
}
}

@Override
public void beforeCommit(final Transaction tx) throws Exception {
// The send was routed: its id takes its slot now, as a send outside a transaction does
if (!afterCommit) {
process();
release(holder);
}
}

@Override
public void afterCommit(final Transaction tx) {
if (afterCommit) {
Expand All @@ -404,7 +425,7 @@ public void afterCommit(final Transaction tx) {
@Override
public void beforeRollback(Transaction tx) throws Exception {
if (!afterCommit) {
deleteFromCache(holder, null);
release(holder);
}
}

Expand Down
62 changes: 62 additions & 0 deletions ...s/src/test/java/org/apache/activemq/artemis/tests/integration/DuplicateDetectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
Expand All @@ -30,6 +31,7 @@
import java.util.Arrays;
import java.util.Collection;

import org.apache.activemq.artemis.api.core.ActiveMQAddressFullException;
import org.apache.activemq.artemis.api.core.ActiveMQDuplicateIdException;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.Message;
Expand All @@ -47,6 +49,7 @@
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
import org.apache.activemq.artemis.tests.extensions.parameterized.Parameter;
Expand All @@ -55,6 +58,7 @@
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.apache.activemq.artemis.utils.Wait;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -918,6 +922,64 @@ public void testRollbackThenSend() throws Exception {
assertEquals(dupID1.toString(), message.getStringProperty("key"));
}

/*
* A send refused after its duplicate check leaves the cache as it was: the id before it is still a duplicate
*/
@TestTemplate
public void testRefusedSendKeepsTheIdBeforeIt() throws Exception {
final SimpleString queueName = SimpleString.of("FullQueue");

server.getAddressSettingsRepository().addMatch(queueName.toString(), new AddressSettings().setIDCacheSize(1).setMaxSizeBytes(10000).setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL));

ClientSession session = sf.createSession(false, true, true);

session.start();

session.createQueue(QueueConfiguration.of(queueName).setDurable(false));

ClientProducer producer = session.createProducer(queueName);

producer.send(createLargeBody(session, "d1"));

int sent = 1;
while (true) {
try {
producer.send(createLargeBody(session, null));
sent++;
assertTrue(sent < 20, "the address never filled");
} catch (ActiveMQAddressFullException e) {
break;
}
}

assertThrows(ActiveMQAddressFullException.class, () -> producer.send(createLargeBody(session, "d2")));

ClientConsumer consumer = session.createConsumer(queueName);
for (int i = 0; i < sent; i++) {
ClientMessage message = consumer.receive(5000);
assertNotNull(message);
message.acknowledge();
}
assertNull(consumer.receiveImmediate());
// Sends the acknowledgements
consumer.close();
Wait.assertEquals(0L, () -> server.getPagingManager().getPageStore(queueName).getAddressSize());

producer.send(createLargeBody(session, "d1"));

consumer = session.createConsumer(queueName);
assertNull(consumer.receive(500));
}

private ClientMessage createLargeBody(final ClientSession session, final String dupID) {
ClientMessage message = session.createMessage(true);
message.getBodyBuffer().writeBytes(new byte[4000]);
if (dupID != null) {
message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, SimpleString.of(dupID));
}
return message;
}

/*
* Entire transaction should be rejected on duplicate detection
* Even if not all entries have dupl id header
Expand Down
Loading