Merge branch 'main' into troubleshoot-ci-flake-2

Author: ansd

.github/workflows/test-authnz.yaml

@@ -72,22 +72,22 @@ jobs:
         docker build -t mocha-test --target test .
 
     - name: Run Suites
-      run: |
+      id: run-suites
+      run: |        
         IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
-        RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
-         ${SELENIUM_DIR}/run-suites.sh full-suite-authnz-messaging
-        mkdir -p /tmp/full-suite-authnz-messaging
-        mv /tmp/selenium/* /tmp/full-suite-authnz-messaging
+        CONF_DIR_PREFIX="$(mktemp -d)" RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
+         ${SELENIUM_DIR}/run-suites.sh full-suite-authnz-messaging        
+        echo "SELENIUM_ARTIFACTS=$CONF_DIR_PREFIX" >> "$GITHUB_OUTPUT"
         
     - name: Upload Test Artifacts
       if: always()
       uses: actions/[email protected]
+      env: 
+          SELENIUM_ARTIFACTS: ${{ steps.run-suites.outputs.SELENIUM_ARTIFACTS }}
       with:
-        name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
+        name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}        
         path: |
-          logs/*
-          screens/*
-          /tmp/selenium/*
+           $SELENIUM_ARTIFACTS/*
 
   summary-selenium:
     needs:

.github/workflows/test-make-tests.yaml

@@ -119,4 +119,4 @@ jobs:
   #     metadata_store: ${{ inputs.metadata_store }}
   #     mixed_clusters: ${{ inputs.mixed_clusters }}
   #     make_target: tests
-  #     plugin: ${{ matrix.plugin }}
+  #     plugin: ${{ matrix.plugin }}

.github/workflows/test-make-type-check.yaml

@@ -34,7 +34,8 @@ jobs:
           - rabbitmq_aws
           - rabbitmq_consistent_hash_exchange
           - rabbitmq_event_exchange
-          - rabbitmq_federation
+          - rabbitmq_exchange_federation
+          - rabbitmq_federation_common
           - rabbitmq_federation_management
           - rabbitmq_federation_prometheus
           - rabbitmq_jms_topic_exchange
@@ -50,6 +51,7 @@ jobs:
           - rabbitmq_peer_discovery_k8s
           - rabbitmq_prelaunch
           - rabbitmq_prometheus
+          - rabbitmq_queue_federation
           - rabbitmq_recent_history_exchange
           - rabbitmq_sharding
           - rabbitmq_shovel

.github/workflows/test-management-ui-for-pr.yaml

@@ -59,19 +59,16 @@ jobs:
     - name: Run short UI suites on a standalone rabbitmq server
       run: |
         IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
-        RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
+        CONF_DIR_PREFIX="$(mktemp -d)" RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
           ${SELENIUM_DIR}/run-suites.sh short-suite-management-ui        
-
-    - name: Prepare logs for upload
-      if: ${{ failure() && steps.tests.outcome == 'failed' }}
-      run: |
-        mkdir -p /tmp/short-suite
-        mv /tmp/selenium/* /tmp/short-suite
+        echo "SELENIUM_ARTIFACTS=$CONF_DIR_PREFIX" >> "$GITHUB_OUTPUT"
         
     - name: Upload Test Artifacts
       if: ${{ failure() && steps.tests.outcome == 'failed' }}
       uses: actions/upload-artifact@v4
+      env: 
+          SELENIUM_ARTIFACTS: ${{ steps.run-suites.outputs.SELENIUM_ARTIFACTS }}
       with:
         name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
         path: |
-          /tmp/short-suite
+          $SELENIUM_ARTIFACTS/*

.github/workflows/test-management-ui.yaml

@@ -67,19 +67,16 @@ jobs:
       id: tests
       run: |
         IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
-        RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
+        CONF_DIR_PREFIX="$(mktemp -d)" RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
           ${SELENIUM_DIR}/run-suites.sh full-suite-management-ui
-
-    - name: Prepare logs for upload
-      if: ${{ failure() && steps.tests.outcome == 'failed' }}
-      run: |
-        mkdir -p /tmp/full-suite
-        mv -v /tmp/selenium/* /tmp/full-suite
+        echo "SELENIUM_ARTIFACTS=$CONF_DIR_PREFIX" >> "$GITHUB_OUTPUT"
         
     - name: Upload Test Artifacts
       if: ${{ failure() && steps.tests.outcome == 'failed' }}
       uses: actions/[email protected]
+      env: 
+          SELENIUM_ARTIFACTS: ${{ steps.run-suites.outputs.SELENIUM_ARTIFACTS }}
       with:
         name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
         path: |
-          /tmp/full-suite
+          $SELENIUM_ARTIFACTS/*

.gitignore

@@ -48,7 +48,9 @@ elvis
 !/deps/rabbitmq_ct_helpers/
 !/deps/rabbitmq_ct_client_helpers/
 !/deps/rabbitmq_event_exchange/
+!/deps/rabbitmq_exchange_federation/
 !/deps/rabbitmq_federation/
+!/deps/rabbitmq_federation_common/
 !/deps/rabbitmq_federation_management/
 !/deps/rabbitmq_federation_prometheus/
 !/deps/rabbitmq_jms_topic_exchange/
@@ -62,6 +64,7 @@ elvis
 !/deps/rabbitmq_peer_discovery_k8s/
 !/deps/rabbitmq_prelaunch/
 !/deps/rabbitmq_prometheus/
+!/deps/rabbitmq_queue_federation/
 !/deps/rabbitmq_random_exchange/
 !/deps/rabbitmq_recent_history_exchange/
 !/deps/rabbitmq_sharding/

deps/rabbit/Makefile

@@ -151,6 +151,7 @@ MANPAGES     = $(wildcard $(DOCS_DIR)/*.[0-9])
 WEB_MANPAGES = $(patsubst %,%.html,$(MANPAGES))
 MD_MANPAGES  = $(patsubst %,%.md,$(MANPAGES))
 
+CT_HOOKS = rabbit_ct_hook
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
 
@@ -221,8 +222,6 @@ ct-fast:
 ct-slow:
 	$(MAKE) ct CT_SUITES='$(SLOW_CT_SUITES)'
 
-CT_OPTS += -ct_hooks rabbit_ct_hook []
-
 # Parallel CT.
 #
 # @todo We must ensure that the CT_OPTS also apply to ct-master
@@ -258,7 +257,7 @@ define ct_master.erl
 	halt(0)
 endef
 
-PARALLEL_CT_SET_1_A = unit_cluster_formation_locking_mocks unit_cluster_formation_sort_nodes unit_collections unit_config_value_encryption unit_connection_tracking
+PARALLEL_CT_SET_1_A = unit_rabbit_ssl unit_cluster_formation_locking_mocks unit_cluster_formation_sort_nodes unit_collections unit_config_value_encryption unit_connection_tracking
 PARALLEL_CT_SET_1_B = amqp_address amqp_auth amqp_credit_api_v2 amqp_filtex amqp_dotnet amqp_jms signal_handling single_active_consumer unit_access_control_authn_authz_context_propagation unit_access_control_credential_validation unit_amqp091_content_framing unit_amqp091_server_properties unit_app_management
 PARALLEL_CT_SET_1_C = amqp_proxy_protocol amqpl_consumer_ack amqpl_direct_reply_to backing_queue bindings rabbit_db_maintenance rabbit_db_msup rabbit_db_policy rabbit_db_queue rabbit_db_topic_exchange rabbit_direct_reply_to_prop cluster_limit cluster_minority term_to_binary_compat_prop topic_permission transactions unicode unit_access_control
 PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility channel_interceptor channel_operation_timeout classic_queue classic_queue_prop config_schema peer_discovery_dns peer_discovery_tmp_hidden_node per_node_limit per_user_connection_channel_limit

deps/rabbit/src/rabbit_classic_queue_index_v2.erl

@@ -22,9 +22,6 @@
          sync/1, needs_sync/1, flush/1,
          bounds/2, next_segment_boundary/1]).
 
-%% Only used by tests
--export([bounds/1]).
-
 %% Used to upgrade/downgrade from/to the v1 index.
 -export([init_for_conversion/3]).
 -export([init_args/1]).
@@ -482,7 +479,7 @@ recover_index_v1_common(State0 = #qi{ queue_name = Name, dir = DirBin },
     {LoSeqId, HiSeqId, _} = rabbit_queue_index:bounds(V1State),
     %% When resuming after a crash we need to double check the messages that are both
     %% in the v1 and v2 index (effectively the messages below the upper bound of the
-    %% v1 index that are about to be written to it).
+    %% v2 index that are about to be written to it).
     {_, V2HiSeqId, _} = bounds(State0, undefined),
     SkipFun = fun
         (SeqId, FunState0) when SeqId < V2HiSeqId ->
@@ -1191,13 +1188,6 @@ flush_pre_publish_cache(TargetRamCount, State) ->
 %% the test suite to pass. This can probably be made more accurate
 %% in the future.
 
-%% `bounds/1` is only used by tests
--spec bounds(State) ->
-                       {non_neg_integer(), non_neg_integer(), State}
-                       when State::state().
-bounds(State) ->
-    bounds(State, undefined).
-
 -spec bounds(State, non_neg_integer() | undefined) ->
                        {non_neg_integer(), non_neg_integer(), State}
                        when State::state().

deps/rabbit/src/rabbit_definitions_import_https.erl

@@ -49,7 +49,8 @@ load(Proplist) ->
     URL = pget(url, Proplist),
     rabbit_log:info("Applying definitions from a remote URL"),
     rabbit_log:debug("HTTPS URL: ~ts", [URL]),
-    TLSOptions = tls_options_or_default(Proplist),
+    TLSOptions0 = tls_options_or_default(Proplist),
+    TLSOptions = rabbit_ssl:wrap_password_opt(TLSOptions0),
     HTTPOptions = http_options(TLSOptions),
     load_from_url(URL, HTTPOptions).
 

deps/rabbit/src/rabbit_fifo.erl

@@ -1529,9 +1529,12 @@ activate_next_consumer(#?STATE{consumers = Cons0,
             State = State0#?STATE{consumers = Cons,
                                   service_queue = ServiceQueue1,
                                   waiting_consumers = Waiting},
+            Effects1 = consumer_update_active_effects(State, Active,
+                                                      false, waiting,
+                                                      Effects0),                                  
             Effects = consumer_update_active_effects(State, Consumer,
                                                      true, single_active,
-                                                     Effects0),
+                                                     Effects1),
             {State, Effects};
         {{ActiveCKey, ?CONSUMER_PRIORITY(ActivePriority) = Active},
          {_NextCKey, ?CONSUMER_PRIORITY(WaitingPriority)}}
@@ -1829,8 +1832,22 @@ complete_and_checkout(#{} = Meta, MsgIds, ConsumerKey,
                       Effects0, State0) ->
     State1 = complete(Meta, ConsumerKey, MsgIds, Con0, State0),
     %% a completion could have removed the active/quiescing consumer
-    {State2, Effects1} = activate_next_consumer(State1, Effects0),
-    checkout(Meta, State0, State2, Effects1).
+    Effects1 = add_active_effect(Con0, State1, Effects0),
+    {State2, Effects2} = activate_next_consumer(State1, Effects1),
+    checkout(Meta, State0, State2, Effects2).
+
+add_active_effect(#consumer{status = quiescing} = Consumer,
+                  #?STATE{cfg = #cfg{consumer_strategy = single_active},
+                          consumers = Consumers} = State,
+                  Effects) ->
+    case active_consumer(Consumers) of
+        undefined ->
+            consumer_update_active_effects(State, Consumer, false, waiting, Effects);
+        _ ->
+            Effects
+    end;
+add_active_effect(_, _, Effects) ->
+    Effects.
 
 cancel_consumer_effects(ConsumerId,
                         #?STATE{cfg = #cfg{resource = QName}},