Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Store MQTT messages as non-durable if QoS 0 #11012

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Store MQTT messages as non-durable if QoS 0 #11012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps/rabbitmq_mqtt/src/mc_mqtt.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ init(Msg = #mqtt_msg{qos = Qos,
when is_integer(Qos) ->
Anns0 = case Qos > 0 of
true ->
#{?ANN_DURABLE => true};
#{};
false ->
#{}
#{?ANN_DURABLE => false}
end,
Anns1 = case Props of
#{'Message-Expiry-Interval' := Seconds} ->
Expand Down
16 changes: 15 additions & 1 deletion deps/rabbitmq_mqtt/test/mc_mqtt_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ groups() ->
mqtt_amqpl_alt,
mqtt_amqp,
mqtt_amqp_alt,
amqp_mqtt
amqp_mqtt,
is_persistent
]}
].

Expand Down Expand Up @@ -501,6 +502,19 @@ amqp_mqtt(_Config) ->
}, Mqtt),
ok.

is_persistent(_Config) ->
Msg0 = #mqtt_msg{qos = 0,
topic = <<"my/topic">>,
payload = <<>>},
Mc0 = mc:init(mc_mqtt, Msg0, #{}),
?assertNot(mc:is_persistent(Mc0)),

Msg1 = #mqtt_msg{qos = 1,
topic = <<"my/topic">>,
payload = <<>>},
Mc1 = mc:init(mc_mqtt, Msg1, #{}),
?assert(mc:is_persistent(Mc1)).

mqtt_msg() ->
#mqtt_msg{qos = 0,
topic = <<"my/topic">>,
Expand Down
14 changes: 12 additions & 2 deletions deps/rabbitmq_mqtt/test/protocol_interop_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
-import(rabbit_ct_broker_helpers,
[rpc/4]).
-import(rabbit_ct_helpers,
[eventually/3]).
[eventually/1,
eventually/3]).

all() ->
[{group, tests}].
Expand Down Expand Up @@ -88,7 +89,8 @@ end_per_testcase(Testcase, Config) ->
mqtt_amqpl_mqtt(Config) ->
Q = ClientId = atom_to_binary(?FUNCTION_NAME),
Ch = rabbit_ct_client_helpers:open_channel(Config),
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = Q}),
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = Q,
durable = true}),
#'queue.bind_ok'{} = amqp_channel:call(Ch, #'queue.bind'{queue = Q,
exchange = <<"amq.topic">>,
routing_key = <<"my.topic">>}),
Expand Down Expand Up @@ -147,6 +149,14 @@ mqtt_amqpl_mqtt(Config) ->
after 1000 -> ct:fail("did not receive reply")
end,

%% Another message MQTT 5.0 to AMQP 0.9.1, this time with QoS 0
ok = emqtt:publish(C, <<"my/topic">>, RequestPayload, [{qos, 0}]),
eventually(
?_assertMatch(
{#'basic.get_ok'{}, #amqp_msg{payload = RequestPayload,
props = #'P_basic'{delivery_mode = 1}}},
amqp_channel:call(Ch, #'basic.get'{queue = Q}))),

ok = emqtt:disconnect(C).

mqtt_amqp_mqtt(Config) ->
Expand Down
Loading