Unconditionally Disable RMQ AutoRecovery

Author: garyrussell

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

@@ -257,13 +257,17 @@ private CachingConnectionFactory(com.rabbitmq.client.ConnectionFactory rabbitCon
 		super(rabbitConnectionFactory);
 		if (!isPublisherFactory) {
 			if (rabbitConnectionFactory.isAutomaticRecoveryEnabled()) {
-				logger.warn("***\nAutomatic Recovery is Enabled in the provided connection factory;\n"
-						+ "while Spring AMQP is compatible with this feature, it\n"
+				rabbitConnectionFactory.setAutomaticRecoveryEnabled(false);
+				logger.warn("***\nAutomatic Recovery was Enabled in the provided connection factory;\n"
+						+ "while Spring AMQP is generally compatible with this feature, there\n"
+						+ "are some corner cases where problems arise. Spring AMQP\n"
 						+ "prefers to use its own recovery mechanisms; when this option is true, you may receive\n"
-						+ "'AutoRecoverConnectionNotCurrentlyOpenException's until the connection is recovered.");
+						+ "'AutoRecoverConnectionNotCurrentlyOpenException's until the connection is recovered.\n"
+						+ "It has therefore been disabled; if you really wish to enable it, use\n"
+						+ "'getRabbitConnectionFactory().setAutomaticRecoveryEnabled(true)',\n"
+						+ "but this is discouraged.");
 			}
-			this.publisherConnectionFactory = new CachingConnectionFactory(getRabbitConnectionFactory(),
-					true);
+			this.publisherConnectionFactory = new CachingConnectionFactory(getRabbitConnectionFactory(), true);
 			setPublisherConnectionFactory(this.publisherConnectionFactory);
 		}
 		else {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1574,6 +1574,7 @@ public void setAddressesTwoHosts() throws Exception {
 		ccf.setAddresses("mq1,mq2");
 		ccf.createConnection();
 		verify(mock).isAutomaticRecoveryEnabled();
+		verify(mock).setAutomaticRecoveryEnabled(false);
 		verify(mock).newConnection(isNull(),
 				aryEq(new Address[] { new Address("mq1"), new Address("mq2") }), anyString());
 		verifyNoMoreInteractions(mock);

src/reference/asciidoc/whats-new.adoc

@@ -76,6 +76,14 @@ See <<async-return>> for more information.
 
 The `RabbitConnectionFactoryBean` now calls `enableHostnameVerification()` by default; to revert to the previous behavior, set the `enableHostnameVerification` property to `false`.
 
+===== Connection Factory Changes
+
+The `CachingConnectionFactory` now unconditionally disables auto recovery in the underlying RabbitMQ `ConnectionFactory`, even if a pre-configured instance is provided in a constructor.
+While steps have been taken to make Spring AMQP compatible with auto recovery, certain corner cases have arisen where issues remain.
+Spring AMQP has had its own recovery mechanism since 1.0.0 and doesn't need to use the recovery provided by the client.
+While it is still possible to enable the feature (using `cachingConnectionFactory.getRabbitConnectionFactory().setAutomaticRecoveryEnabled()`) after the `CachingConnectionFactory` is constructed, it is **strongly recommended that you not do so**.
+Use a separate RabbitMQ `ConnectionFactory` if you need auto recovery connections when using the client factory directly (rather than via Spring AMQP components).
+
 ===== Listener Container Changes
 
 The default `ConditionalRejectingErrorHandler` will now completely discard messages that cause fatal errors if an `x-death` header is present.