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

Merge pull request #13144 from savonarola/0528-increase-bridge-buffer-drop-log-level 

chore(bridges): increase log level for bridge buffer overflow reports
This commit is contained in:
Ilia Averianov 2024-06-04 12:37:50 +03:00 committed by GitHub
parent a8a67a2ac9 db713cb656
commit dc95218c68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_conf/src/emqx_conf_schema.erl
View File

@ -81,7 +81,8 @@
cannot_publish_to_topic_due_to_quota_exceeded, cannot_publish_to_topic_due_to_quota_exceeded,
connection_rejected_due_to_license_limit_reached, connection_rejected_due_to_license_limit_reached,
dropped_msg_due_to_mqueue_is_full, dropped_msg_due_to_mqueue_is_full,
socket_receive_paused_by_rate_limit socket_receive_paused_by_rate_limit,
data_bridge_buffer_overflow
]). ]).
%% Callback to upgrade config after loaded from config file but before validation. %% Callback to upgrade config after loaded from config file but before validation.

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

@ -1,7 +1,7 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{application, emqx_resource, [ {application, emqx_resource, [
{description, "Manager for all external resources"}, {description, "Manager for all external resources"},
{vsn, "0.1.29"}, {vsn, "0.1.30"},
{registered, []}, {registered, []},
{mod, {emqx_resource_app, []}}, {mod, {emqx_resource_app, []}},
{applications, [ {applications, [

4
apps/emqx_resource/src/emqx_resource_buffer_worker.erl
View File

@ -1777,8 +1777,8 @@ append_queue(Id, Index, Q, Queries) ->
ok = replayq:ack(Q1, QAckRef), ok = replayq:ack(Q1, QAckRef),
Dropped = length(Items2), Dropped = length(Items2),
Counters = #{dropped_queue_full => Dropped}, Counters = #{dropped_queue_full => Dropped},
?SLOG(info, #{ ?SLOG_THROTTLE(warning, #{
msg => "buffer_worker_overflow", msg => data_bridge_buffer_overflow,
resource_id => Id, resource_id => Id,
worker_index => Index, worker_index => Index,
dropped => Dropped dropped => Dropped

1
changes/ce/feat-13144.en.md Normal file
View File

@ -0,0 +1 @@
Emit a `warning` level throttled log when bridge buffers are overflown and messages get dropped. Previously, the log events had `info` level and were not visible with the default log level.