Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ARTEMIS-2057 Fix runaway credit grants
Ensure the broker looks at local receiver credit when checking for credit top off threshold and then do a proper top off back to the high water mark to sync with how client receivers manage their credit. (cherry picked from commit 3425409)
- Loading branch information
Showing
3 changed files
with
254 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
248 changes: 248 additions & 0 deletions
248
...c/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallbackTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,248 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.activemq.artemis.protocol.amqp.broker; | ||
|
||
import static org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport.AMQP_CREDITS_DEFAULT; | ||
import static org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport.AMQP_LOW_CREDITS_DEFAULT; | ||
import static org.junit.Assert.assertNotNull; | ||
import static org.mockito.ArgumentMatchers.any; | ||
import static org.mockito.ArgumentMatchers.anyInt; | ||
import static org.mockito.Mockito.never; | ||
|
||
import java.util.concurrent.Executor; | ||
|
||
import org.apache.activemq.artemis.api.core.SimpleString; | ||
import org.apache.activemq.artemis.core.paging.PagingManager; | ||
import org.apache.activemq.artemis.core.paging.PagingStore; | ||
import org.apache.activemq.artemis.core.persistence.OperationContext; | ||
import org.apache.activemq.artemis.core.server.ActiveMQServer; | ||
import org.apache.activemq.artemis.protocol.amqp.proton.AMQPConnectionContext; | ||
import org.apache.activemq.artemis.spi.core.remoting.Connection; | ||
import org.apache.qpid.proton.engine.Receiver; | ||
import org.junit.Rule; | ||
import org.junit.Test; | ||
import org.mockito.ArgumentCaptor; | ||
import org.mockito.Mock; | ||
import org.mockito.Mockito; | ||
import org.mockito.junit.MockitoJUnit; | ||
import org.mockito.junit.MockitoRule; | ||
import org.mockito.quality.Strictness; | ||
|
||
public class AMQPSessionCallbackTest { | ||
|
||
@Rule public MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS); | ||
|
||
@Mock private AMQPConnectionCallback protonSPI; | ||
@Mock private ProtonProtocolManager manager; | ||
@Mock private AMQPConnectionContext connection; | ||
@Mock private Connection transportConnection; | ||
@Mock private Executor executor; | ||
@Mock private OperationContext operationContext; | ||
@Mock private Receiver receiver; | ||
@Mock private ActiveMQServer server; | ||
@Mock private PagingManager pagingManager; | ||
@Mock private PagingStore pagingStore; | ||
|
||
/** | ||
* Test that the AMQPSessionCallback grants no credit when not at threshold | ||
*/ | ||
@Test | ||
public void testOfferProducerWithNoAddressDoesNotTopOffCreditAboveThreshold() { | ||
// Mock returns to get at the runnable that grants credit. | ||
Mockito.when(manager.getServer()).thenReturn(server); | ||
Mockito.when(server.getPagingManager()).thenReturn(pagingManager); | ||
|
||
// Capture credit runnable and invoke to trigger credit top off | ||
ArgumentCaptor<Runnable> argument = ArgumentCaptor.forClass(Runnable.class); | ||
AMQPSessionCallback session = new AMQPSessionCallback( | ||
protonSPI, manager, connection, transportConnection, executor, operationContext); | ||
|
||
// Credit is above threshold | ||
Mockito.when(receiver.getCredit()).thenReturn(AMQP_LOW_CREDITS_DEFAULT + 1); | ||
|
||
session.offerProducerCredit(null, AMQP_CREDITS_DEFAULT, AMQP_LOW_CREDITS_DEFAULT, receiver); | ||
|
||
// Run the credit refill code. | ||
Mockito.verify(pagingManager).checkMemory(argument.capture()); | ||
assertNotNull(argument.getValue()); | ||
argument.getValue().run(); | ||
|
||
// Ensure we aren't looking at remote credit as that gives us the wrong view of what credit is at the broker | ||
Mockito.verify(receiver, never()).getRemoteCredit(); | ||
|
||
// Credit runnable should not top off credit to configured value | ||
Mockito.verify(receiver, never()).flow(anyInt()); | ||
} | ||
|
||
/** | ||
* Test that when at threshold the manager tops off credit for anonymous sender | ||
*/ | ||
@Test | ||
public void testOfferProducerWithNoAddressTopsOffCreditAtThreshold() { | ||
// Mock returns to get at the runnable that grants credit. | ||
Mockito.when(manager.getServer()).thenReturn(server); | ||
Mockito.when(server.getPagingManager()).thenReturn(pagingManager); | ||
|
||
// Capture credit runnable and invoke to trigger credit top off | ||
ArgumentCaptor<Runnable> argument = ArgumentCaptor.forClass(Runnable.class); | ||
AMQPSessionCallback session = new AMQPSessionCallback( | ||
protonSPI, manager, connection, transportConnection, executor, operationContext); | ||
|
||
// Credit is at threshold | ||
Mockito.when(receiver.getCredit()).thenReturn(AMQP_LOW_CREDITS_DEFAULT); | ||
|
||
session.offerProducerCredit(null, AMQP_CREDITS_DEFAULT, AMQP_LOW_CREDITS_DEFAULT, receiver); | ||
|
||
// Run the credit refill code. | ||
Mockito.verify(pagingManager).checkMemory(argument.capture()); | ||
assertNotNull(argument.getValue()); | ||
argument.getValue().run(); | ||
|
||
// Ensure we aren't looking at remote credit as that gives us the wrong view of what credit is at the broker | ||
Mockito.verify(receiver, never()).getRemoteCredit(); | ||
|
||
// Credit runnable should top off credit to configured value | ||
Mockito.verify(receiver).flow(AMQP_CREDITS_DEFAULT - AMQP_LOW_CREDITS_DEFAULT); | ||
} | ||
|
||
/** | ||
* Test that the AMQPSessionCallback grants no credit when not at threshold | ||
*/ | ||
@Test | ||
public void testOfferProducerWithAddressDoesNotTopOffCreditAboveThreshold() throws Exception { | ||
// Mock returns to get at the runnable that grants credit. | ||
Mockito.when(manager.getServer()).thenReturn(server); | ||
Mockito.when(server.getPagingManager()).thenReturn(pagingManager); | ||
Mockito.when(pagingManager.getPageStore(any(SimpleString.class))).thenReturn(pagingStore); | ||
|
||
// Capture credit runnable and invoke to trigger credit top off | ||
ArgumentCaptor<Runnable> argument = ArgumentCaptor.forClass(Runnable.class); | ||
AMQPSessionCallback session = new AMQPSessionCallback( | ||
protonSPI, manager, connection, transportConnection, executor, operationContext); | ||
|
||
// Credit is above threshold | ||
Mockito.when(receiver.getCredit()).thenReturn(AMQP_LOW_CREDITS_DEFAULT + 1); | ||
|
||
session.offerProducerCredit(new SimpleString("test"), AMQP_CREDITS_DEFAULT, AMQP_LOW_CREDITS_DEFAULT, receiver); | ||
|
||
// Run the credit refill code. | ||
Mockito.verify(pagingStore).checkMemory(argument.capture()); | ||
assertNotNull(argument.getValue()); | ||
argument.getValue().run(); | ||
|
||
// Ensure we aren't looking at remote credit as that gives us the wrong view of what credit is at the broker | ||
Mockito.verify(receiver, never()).getRemoteCredit(); | ||
|
||
// Credit runnable should not top off credit to configured value | ||
Mockito.verify(receiver, never()).flow(anyInt()); | ||
} | ||
|
||
/** | ||
* Test that when at threshold the manager tops off credit for sender | ||
*/ | ||
@Test | ||
public void testOfferProducerWithAddressTopsOffCreditAtThreshold() throws Exception { | ||
// Mock returns to get at the runnable that grants credit. | ||
Mockito.when(manager.getServer()).thenReturn(server); | ||
Mockito.when(server.getPagingManager()).thenReturn(pagingManager); | ||
Mockito.when(pagingManager.getPageStore(any(SimpleString.class))).thenReturn(pagingStore); | ||
|
||
// Capture credit runnable and invoke to trigger credit top off | ||
ArgumentCaptor<Runnable> argument = ArgumentCaptor.forClass(Runnable.class); | ||
AMQPSessionCallback session = new AMQPSessionCallback( | ||
protonSPI, manager, connection, transportConnection, executor, operationContext); | ||
|
||
// Credit is at threshold | ||
Mockito.when(receiver.getCredit()).thenReturn(AMQP_LOW_CREDITS_DEFAULT); | ||
|
||
session.offerProducerCredit(new SimpleString("test"), AMQP_CREDITS_DEFAULT, AMQP_LOW_CREDITS_DEFAULT, receiver); | ||
|
||
// Run the credit refill code. | ||
Mockito.verify(pagingStore).checkMemory(argument.capture()); | ||
assertNotNull(argument.getValue()); | ||
argument.getValue().run(); | ||
|
||
// Ensure we aren't looking at remote credit as that gives us the wrong view of what credit is at the broker | ||
Mockito.verify(receiver, never()).getRemoteCredit(); | ||
|
||
// Credit runnable should top off credit to configured value | ||
Mockito.verify(receiver).flow(AMQP_CREDITS_DEFAULT - AMQP_LOW_CREDITS_DEFAULT); | ||
} | ||
|
||
/** | ||
* Test that the AMQPSessionCallback grants no credit when the computation results in negative credit | ||
*/ | ||
@Test | ||
public void testOfferProducerWithNoAddressDoesNotGrantNegativeCredit() { | ||
// Mock returns to get at the runnable that grants credit. | ||
Mockito.when(manager.getServer()).thenReturn(server); | ||
Mockito.when(server.getPagingManager()).thenReturn(pagingManager); | ||
|
||
// Capture credit runnable and invoke to trigger credit top off | ||
ArgumentCaptor<Runnable> argument = ArgumentCaptor.forClass(Runnable.class); | ||
AMQPSessionCallback session = new AMQPSessionCallback( | ||
protonSPI, manager, connection, transportConnection, executor, operationContext); | ||
|
||
// Credit is at threshold | ||
Mockito.when(receiver.getCredit()).thenReturn(AMQP_LOW_CREDITS_DEFAULT); | ||
|
||
session.offerProducerCredit(null, 1, AMQP_LOW_CREDITS_DEFAULT, receiver); | ||
|
||
// Run the credit refill code. | ||
Mockito.verify(pagingManager).checkMemory(argument.capture()); | ||
assertNotNull(argument.getValue()); | ||
argument.getValue().run(); | ||
|
||
// Ensure we aren't looking at remote credit as that gives us the wrong view of what credit is at the broker | ||
Mockito.verify(receiver, never()).getRemoteCredit(); | ||
|
||
// Credit runnable should not grant what would be negative credit here | ||
Mockito.verify(receiver, never()).flow(anyInt()); | ||
} | ||
|
||
/** | ||
* Test that the AMQPSessionCallback grants no credit when the computation results in negative credit | ||
*/ | ||
@Test | ||
public void testOfferProducerWithAddressDoesNotGrantNegativeCredit() throws Exception { | ||
// Mock returns to get at the runnable that grants credit. | ||
Mockito.when(manager.getServer()).thenReturn(server); | ||
Mockito.when(server.getPagingManager()).thenReturn(pagingManager); | ||
Mockito.when(pagingManager.getPageStore(any(SimpleString.class))).thenReturn(pagingStore); | ||
|
||
// Capture credit runnable and invoke to trigger credit top off | ||
ArgumentCaptor<Runnable> argument = ArgumentCaptor.forClass(Runnable.class); | ||
AMQPSessionCallback session = new AMQPSessionCallback( | ||
protonSPI, manager, connection, transportConnection, executor, operationContext); | ||
|
||
// Credit is at threshold | ||
Mockito.when(receiver.getCredit()).thenReturn(AMQP_LOW_CREDITS_DEFAULT); | ||
|
||
session.offerProducerCredit(new SimpleString("test"), 1, AMQP_LOW_CREDITS_DEFAULT, receiver); | ||
|
||
// Run the credit refill code. | ||
Mockito.verify(pagingStore).checkMemory(argument.capture()); | ||
assertNotNull(argument.getValue()); | ||
argument.getValue().run(); | ||
|
||
// Ensure we aren't looking at remote credit as that gives us the wrong view of what credit is at the broker | ||
Mockito.verify(receiver, never()).getRemoteCredit(); | ||
|
||
// Credit runnable should not grant what would be negative credit here | ||
Mockito.verify(receiver, never()).flow(anyInt()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters