test

Author: dumbbell

deps/rabbit/test/clustering_recovery_SUITE.erl

@@ -811,35 +811,49 @@ temporary_queue_after_partition_recovery_2(Config, QueueDeclare) ->
       end, Nodes),
 
     %% Publich to and consume from the queue.
+    ct:pal("Open connection"),
     {_PConn, PCh} = rabbit_ct_client_helpers:open_connection_and_channel(
                       Config, Node2),
+    ct:pal("Publish messages to Q1"),
     publish_many(PCh, QName1#resource.name, 10),
+    ct:pal("Publish messages to Q2"),
     publish_many(PCh, QName2#resource.name, 10),
+    ct:pal("Consume all messages"),
     consume(20),
 
     %% Close the first consuming client to trigger the queue deletion during
     %% the network partition. Because of the network partition, the queue
     %% process exits but it couldn't delete the queue record.
-    _ = rabbit_ct_client_helpers:close_connection_and_channel(
-          Conn1, Ch1),
+    ct:pal("Close connection 1"),
+    _ = spawn(fun() ->
+                      rabbit_ct_client_helpers:close_connection_and_channel(
+                        Conn1, Ch1)
+              end),
 
     KhepriTimeout = rabbit_ct_broker_helpers:rpc(Config, Node2, khepri_app, get_default_timeout, []),
+    ct:pal("Sleep > ~b ms", [KhepriTimeout]),
     timer:sleep(KhepriTimeout + 10000),
 
     %% Close the second consuming client to trigger the queue deletion during
     %% the network partition. This time, the partition is solved while the
     %% queue process tries to delete the record.
-    _ = rabbit_ct_client_helpers:close_connection_and_channel(
-          Conn2, Ch2),
+    ct:pal("Close connection 2"),
+    _ = spawn(fun() ->
+                      rabbit_ct_client_helpers:close_connection_and_channel(
+                        Conn2, Ch2)
+              end),
 
     %% We resolve the network partition.
     lists:foreach(
       fun(Node) ->
+              ct:pal("Allow traffic with ~s", [Node]),
               rabbit_ct_broker_helpers:allow_traffic_between(
                 Node2, Node)
       end, Majority),
+    ct:pal("Cluster status"),
     clustering_utils:assert_cluster_status({Nodes, Nodes}, Nodes),
 
+    ct:pal("Wait for connection DOWN"),
     receive
         {'DOWN', CMRef1, _, _, Reason1_1} ->
             ct:pal("Connection ~p exited: ~p", [Conn1, Reason1_1]),
@@ -848,6 +862,7 @@ temporary_queue_after_partition_recovery_2(Config, QueueDeclare) ->
     after Timeout ->
               ct:fail("Connection ~p still running", [Conn1])
     end,
+    ct:pal("Wait for queue DOWN"),
     receive
         {'DOWN', QMRef1, _, _, Reason1_2} ->
             ct:pal("Queue ~p exited: ~p", [QPid1, Reason1_2]),