Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rabbitmq/rabbitmq-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8b7e8564361be496e6a1ed3caa718a3556e2f3a2
Choose a base ref
..
head repository: rabbitmq/rabbitmq-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0a4d8a8a5094205a2c92917acaa4637c8fb3eba1
Choose a head ref
4 changes: 2 additions & 2 deletions .github/workflows/ibm-mq-make.yaml
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ on:
env:
REGISTRY_IMAGE: pivotalrabbitmq/ibm-mqadvanced-server-dev
IBM_MQ_REPOSITORY: ibm-messaging/mq-container
IBM_MQ_BRANCH_NAME: 9.3.5
IMAGE_TAG: 9.3.5.1-amd64
IBM_MQ_BRANCH_NAME: 9.4.0
IMAGE_TAG: 9.4.0.5-amd64
jobs:
docker:
runs-on: ubuntu-latest
2 changes: 1 addition & 1 deletion deps/rabbit/src/rabbit_quorum_queue_periodic_membership_reconciliation.erl
View file
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ reconciliate_quorum_members(ExpectedNodes, Running, [Q | LocalLeaders],
OldResult) ->
Result =
maybe
{ok, Members, {_, LeaderNode}} = ra:members(amqqueue:get_pid(Q), 500),
{ok, Members, {_, LeaderNode}} ?= ra:members(amqqueue:get_pid(Q), 500),
%% Check if Leader is indeed this node
LeaderNode ?= node(),
%% And that this not is not in maintenance mode
1 change: 1 addition & 0 deletions deps/rabbitmq_mqtt/test/mqtt_shared_SUITE.erl
View file
Original file line number Diff line number Diff line change
@@ -1161,6 +1161,7 @@ rabbit_mqtt_qos0_queue_kill_node(Config) ->
%% Re-connect to a live node with same MQTT client ID.
Sub1 = connect(SubscriberId, Config, 1, []),
{ok, _, [0]} = emqtt:subscribe(Sub1, Topic2, qos0),
ok = await_metadata_store_consistent(Config, 2),
ok = emqtt:publish(Pub, Topic2, <<"m1">>, qos0),
ok = expect_publishes(Sub1, Topic2, [<<"m1">>]),
%% Since we started a new clean session, previous subscription should have been deleted.