diff --git a/lib-ee/emqx_ee_bridge/i18n/emqx_ee_bridge_kafka.conf b/lib-ee/emqx_ee_bridge/i18n/emqx_ee_bridge_kafka.conf index 1fdbfedc4..c163db70b 100644 --- a/lib-ee/emqx_ee_bridge/i18n/emqx_ee_bridge_kafka.conf +++ b/lib-ee/emqx_ee_bridge/i18n/emqx_ee_bridge_kafka.conf @@ -438,10 +438,12 @@ emqx_ee_bridge_kafka { desc { en: "Applicable when buffer mode is set to memory or hybrid.\n" "EMQX will drop old cached messages under high memory pressure. " - "The high memory threshold is defined in config sysmon.os.sysmem_high_watermark." + "The high memory threshold is defined in config sysmon.os.sysmem_high_watermark. " + "NOTE: This config only works on Linux." zh: "缓存模式是 memoryhybrid 时适用。" "当系统处于高内存压力时,从队列中丢弃旧的消息以减缓内存增长。" "内存压力值由配置项 sysmon.os.sysmem_high_watermark 决定。" + "注意,该配置仅在 Linux 系统中有效。" } label { en: "Memory Overload Protection" diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src index 343325c5c..1563cb8ef 100644 --- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src +++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src @@ -1,6 +1,6 @@ {application, emqx_ee_bridge, [ {description, "EMQX Enterprise data bridges"}, - {vsn, "0.1.1"}, + {vsn, "0.1.2"}, {registered, []}, {applications, [ kernel, diff --git a/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_producer.erl b/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_producer.erl index 6145716f2..b46bdb486 100644 --- a/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_producer.erl +++ b/lib-ee/emqx_ee_bridge/src/kafka/emqx_bridge_impl_kafka_producer.erl @@ -236,10 +236,14 @@ producers_config(BridgeName, ClientId, Input) -> mode := BufferMode, per_partition_limit := PerPartitionLimit, segment_bytes := SegmentBytes, - memory_overload_protection := MemOLP + memory_overload_protection := MemOLP0 } } = Input, - + MemOLP = + case os:type() of + {unix, linux} -> MemOLP0; + _ -> false + end, {OffloadMode, ReplayqDir} = case BufferMode of memory -> {false, false};