Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ARTEMIS-1898 - make sure tosend credits on rejected messages
And also to run the credit runnables once memory is free in fail mode https://issues.apache.org/jira/browse/ARTEMIS-1898
- Loading branch information
1 parent
51f4bf0
commit 82795b7
Showing
4 changed files
with
131 additions
and
12 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
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
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
94 changes: 94 additions & 0 deletions
94
...test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFlowControlFailTest.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,94 @@ | ||
| /* | ||
| * 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.tests.integration.amqp; | ||
|
|
||
| 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.transport.amqp.client.AmqpClient; | ||
| import org.apache.activemq.transport.amqp.client.AmqpConnection; | ||
| import org.apache.activemq.transport.amqp.client.AmqpMessage; | ||
| import org.apache.activemq.transport.amqp.client.AmqpReceiver; | ||
| import org.apache.activemq.transport.amqp.client.AmqpSender; | ||
| import org.apache.activemq.transport.amqp.client.AmqpSession; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class AmqpFlowControlFailTest extends JMSClientTestSupport { | ||
|
|
||
| @Override | ||
| protected void configureAddressPolicy(ActiveMQServer server) { | ||
| // For BLOCK tests | ||
| AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch("#"); | ||
| addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL); | ||
| addressSettings.setMaxSizeBytes(1000); | ||
| // addressSettings.setMaxSizeBytesRejectThreshold(MAX_SIZE_BYTES_REJECT_THRESHOLD); | ||
| server.getAddressSettingsRepository().addMatch("#", addressSettings); | ||
| } | ||
|
|
||
| @Test(timeout = 60000) | ||
| public void testMesagesNotSent() throws Exception { | ||
| AmqpClient client = createAmqpClient(getBrokerAmqpConnectionURI()); | ||
| AmqpConnection connection = addConnection(client.connect()); | ||
| int messagesSent = 0; | ||
| try { | ||
| AmqpSession session = connection.createSession(); | ||
| AmqpSender sender = session.createSender(getQueueName()); | ||
| boolean rejected = false; | ||
| for (int i = 0; i < 1000; i++) { | ||
| final AmqpMessage message = new AmqpMessage(); | ||
| byte[] payload = new byte[10]; | ||
| message.setBytes(payload); | ||
| try { | ||
| sender.send(message); | ||
| messagesSent++; | ||
| System.out.println("message = " + message); | ||
| } catch (IOException e) { | ||
| rejected = true; | ||
| } | ||
| } | ||
| assertTrue(rejected); | ||
| rejected = false; | ||
| assertEquals(0, sender.getSender().getCredit()); | ||
| AmqpSession session2 = connection.createSession(); | ||
| AmqpReceiver receiver = session2.createReceiver(getQueueName()); | ||
| receiver.flow(messagesSent); | ||
| for (int i = 0; i < messagesSent; i++) { | ||
| AmqpMessage receive = receiver.receive(); | ||
| receive.accept(); | ||
| } | ||
| receiver.close(); | ||
| session2.close(); | ||
| assertEquals(1000, sender.getSender().getCredit()); | ||
| for (int i = 0; i < 1000; i++) { | ||
| final AmqpMessage message = new AmqpMessage(); | ||
| byte[] payload = new byte[100]; | ||
| message.setBytes(payload); | ||
| try { | ||
| sender.send(message); | ||
| } catch (IOException e) { | ||
| rejected = true; | ||
| } | ||
| } | ||
| assertTrue(rejected); | ||
| assertEquals(0, sender.getSender().getCredit()); | ||
| } finally { | ||
| connection.close(); | ||
| } | ||
| } | ||
| } |