yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(kafka-based bridges): avoid trying to get raw config for replayq dir 

Fixes https://emqx.atlassian.net/browse/EMQX-12049
This commit is contained in:
Thales Macedo Garitezi 2024-03-21 11:49:00 -03:00
parent ea917d6b2b
commit 04bf763890
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_bridge_kafka/src/emqx_bridge_kafka.app.src
View File

@ -1,7 +1,7 @@
%% -*- mode: erlang -*-
{application, emqx_bridge_kafka, [
{description, "EMQX Enterprise Kafka Bridge"},
{vsn, "0.2.2"},
{vsn, "0.2.3"},
{registered, [emqx_bridge_kafka_consumer_sup]},
{applications, [
kernel,

11
apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl_producer.erl
View File

@ -668,9 +668,8 @@ partitioner(random) -> random;
partitioner(key_dispatch) -> first_key_dispatch.
replayq_dir(BridgeType, BridgeName) ->
RawConf = emqx_conf:get_raw([actions, BridgeType, BridgeName]),
DirName = iolist_to_binary([
emqx_bridge_lib:downgrade_type(BridgeType, RawConf),
maybe_v1_type_name(BridgeType),
":",
BridgeName,
":",
@ -678,6 +677,14 @@ replayq_dir(BridgeType, BridgeName) ->
]),
filename:join([emqx:data_dir(), "kafka", DirName]).
%% To avoid losing queued data on disk, we must use the same directory as the old v1
%% bridges, if any. Among the Kafka-based bridges that exist since v1, only Kafka changed
%% its type name. Other bridges are either unchanged, or v2-only, and should use their v2
%% type names.
maybe_v1_type_name(Type) when is_atom(Type) -> maybe_v1_type_name(atom_to_binary(Type));
maybe_v1_type_name(<<"kafka_producer">>) -> <<"kafka">>;
maybe_v1_type_name(Type) -> Type.
with_log_at_error(Fun, Log) ->
try
Fun()