Call consumer shutdown callback even if close times out

References #1651

(cherry picked from commit f9b69f3)

Author: acogoluegnes

src/main/java/com/rabbitmq/client/impl/ChannelN.java

@@ -33,6 +33,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Main interface to AMQP protocol functionality. Public API -
@@ -609,10 +610,13 @@ protected void close(int closeCode,
             signal.initCause(cause);
         }
 
+        AtomicBoolean finishProcessShutdownSignalCalled = new AtomicBoolean(false);
         BlockingRpcContinuation<AMQCommand> k = new BlockingRpcContinuation<AMQCommand>(){
             @Override
             public AMQCommand transformReply(AMQCommand command) {
-                ChannelN.this.finishProcessShutdownSignal();
+                if (finishProcessShutdownSignalCalled.compareAndSet(false, true)) {
+                    ChannelN.this.finishProcessShutdownSignal();
+                }
                 return command;
             }};
         boolean notify = false;
@@ -643,6 +647,13 @@ public AMQCommand transformReply(AMQCommand command) {
             if (!abort)
                 throw ioe;
         } finally {
+            if (finishProcessShutdownSignalCalled.compareAndSet(false, true)) {
+                try {
+                    ChannelN.this.finishProcessShutdownSignal();
+                } catch (Exception e) {
+                    LOGGER.info("Error while processing shutdown signal: {}", e.getMessage());
+                }
+            }
             if (abort || notify) {
                 // Now we know everything's been cleaned up and there should
                 // be no more surprises arriving on the wire. Release the

src/test/java/com/rabbitmq/client/test/BlockedConnectionTest.java

@@ -77,6 +77,9 @@ void shutdownListenerShouldBeCalledWhenChannelDies() throws Exception {
       CountDownLatch blockedLatch = new CountDownLatch(1);
       c.addBlockedListener(reason -> blockedLatch.countDown(), () -> {});
       Channel ch = c.createChannel();
+      String q = ch.queueDeclare().getQueue();
+      CountDownLatch consShutdownLatch = new CountDownLatch(1);
+      ch.basicConsume(q, (ctag, msg) -> { }, (ctag, r) -> consShutdownLatch.countDown());
       CountDownLatch chShutdownLatch = new CountDownLatch(1);
       ch.addShutdownListener(cause -> chShutdownLatch.countDown());
       ch.confirmSelect();
@@ -89,6 +92,7 @@ void shutdownListenerShouldBeCalledWhenChannelDies() throws Exception {
       ch.basicPublish("", "", MessageProperties.BASIC, "".getBytes());
       assertThatThrownBy(() -> ch.waitForConfirmsOrDie(confirmTimeout))
           .isInstanceOf(TimeoutException.class);
+      assertThat(consShutdownLatch).is(completed());
       assertThat(chShutdownLatch).is(completed());
     } finally {
       if (blocked) {

src/test/java/com/rabbitmq/client/test/functional/ConsumerCancelNotification.java renamed to src/test/java/com/rabbitmq/client/test/functional/ConsumerNotifications.java

@@ -28,10 +28,11 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class ConsumerCancelNotification extends BrokerTestCase {
+public class ConsumerNotifications extends BrokerTestCase {
 
     private final String queue = "cancel_notification_queue";
 
@@ -42,7 +43,7 @@ public class ConsumerCancelNotification extends BrokerTestCase {
         channel.queueDeclare(queue, false, true, false, null);
         Consumer consumer = new DefaultConsumer(channel) {
             @Override
-            public void handleCancel(String consumerTag) throws IOException {
+            public void handleCancel(String consumerTag) {
                 try {
                     result.put(true);
                 } catch (InterruptedException e) {
@@ -55,7 +56,31 @@ public void handleCancel(String consumerTag) throws IOException {
         assertTrue(result.take());
     }
 
-    class AlteringConsumer extends DefaultConsumer {
+    @Test public void consumerCancellationHandlerUsesBlockingOperations()
+            throws IOException, InterruptedException {
+        final String altQueue = "basic.cancel.fallback";
+        channel.queueDeclare(queue, false, true, false, null);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        final AlteringConsumer consumer = new AlteringConsumer(channel, altQueue, latch);
+
+        channel.basicConsume(queue, consumer);
+        channel.queueDelete(queue);
+
+        latch.await(2, TimeUnit.SECONDS);
+    }
+
+    @Test
+    void handleShutdownShouldBeCalledWhenChannelIsClosed() throws Exception {
+        Channel ch = connection.createChannel();
+        String q = ch.queueDeclare().getQueue();
+        CountDownLatch latch = new CountDownLatch(1);
+        ch.basicConsume(q, (ctag, msg) -> {}, (ctag, r) -> latch.countDown());
+        ch.close();
+        assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
+    }
+
+    private static class AlteringConsumer extends DefaultConsumer {
         private final String altQueue;
         private final CountDownLatch latch;
 
@@ -81,18 +106,4 @@ public void handleCancel(String consumerTag) {
             }
         }
     }
-
-    @Test public void consumerCancellationHandlerUsesBlockingOperations()
-            throws IOException, InterruptedException {
-        final String altQueue = "basic.cancel.fallback";
-        channel.queueDeclare(queue, false, true, false, null);
-
-        CountDownLatch latch = new CountDownLatch(1);
-        final AlteringConsumer consumer = new AlteringConsumer(channel, altQueue, latch);
-
-        channel.basicConsume(queue, consumer);
-        channel.queueDelete(queue);
-
-        latch.await(2, TimeUnit.SECONDS);
-    }
 }

src/test/java/com/rabbitmq/client/test/functional/FunctionalTestSuite.java

@@ -53,7 +53,7 @@
     DefaultExchange.class,
     UnbindAutoDeleteExchange.class,
     Confirm.class,
-    ConsumerCancelNotification.class,
+    ConsumerNotifications.class,
     UnexpectedFrames.class,
     PerQueueTTL.class,
     PerMessageTTL.class,