Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1026: Fix Delay with CacheMode.CONNECTION

Browse Source 
Fixes https://github.com/spring-projects/spring-amqp/issues/1026

When using a `channelCheckoutTimeout` with `CacheModeConnection`,
we incorrectly spin waiting for a connection until the timeout
expires.

We should only wait for a connection if the limit is exceeded.

**cherry-pick to all supported**
This commit is contained in:
Gary Russell
2019-06-17 10:19:12 -04:00
committed by Artem Bilan
parent b4103a1354
commit dde7a37350
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
View File

@@ -719,7 +719,7 @@ public class CachingConnectionFactory extends AbstractConnectionFactory
private Connection connectionFromCache() {
ChannelCachingConnectionProxy cachedConnection = findIdleConnection();
long now = System.currentTimeMillis();
if (cachedConnection == null) {
if (cachedConnection == null && countOpenConnections() >= this.connectionLimit) {
cachedConnection = waitForConnection(now);
}
if (cachedConnection == null) {

19
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactoryTests.java
View File

@@ -1791,4 +1791,23 @@ public class CachingConnectionFactoryTests extends AbstractConnectionFactoryTest
closeExec.shutdownNow();
}
@Test
public void testFirstConnectionDoesntWait() throws IOException, TimeoutException {
com.rabbitmq.client.ConnectionFactory mockConnectionFactory = mock(com.rabbitmq.client.ConnectionFactory.class);
com.rabbitmq.client.Connection mockConnection = mock(com.rabbitmq.client.Connection.class);
Channel mockChannel = mock(Channel.class);
given(mockConnectionFactory.newConnection((ExecutorService) isNull(), anyString())).willReturn(mockConnection);
given(mockConnection.createChannel()).willReturn(mockChannel);
given(mockChannel.isOpen()).willReturn(true);
given(mockConnection.isOpen()).willReturn(true);
CachingConnectionFactory ccf = new CachingConnectionFactory(mockConnectionFactory);
ccf.setCacheMode(CacheMode.CONNECTION);
ccf.setChannelCheckoutTimeout(60000);
long t1 = System.currentTimeMillis();
ccf.createConnection();
assertThat(System.currentTimeMillis() - t1).isLessThan(30_000);
}
}