From bbbfea1b5b2302d824de0352a2c31e2183b949de Mon Sep 17 00:00:00 2001 From: EMQ-YangM Date: Mon, 16 May 2022 11:08:00 +0800 Subject: [PATCH 1/4] fix: ignore all other events --- apps/emqx_resource/src/emqx_resource_manager.erl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/emqx_resource/src/emqx_resource_manager.erl b/apps/emqx_resource/src/emqx_resource_manager.erl index 8edee1c1a..5ce4d0c45 100644 --- a/apps/emqx_resource/src/emqx_resource_manager.erl +++ b/apps/emqx_resource/src/emqx_resource_manager.erl @@ -273,7 +273,10 @@ handle_event({call, From}, health_check, stopped, _Data) -> Actions = [{reply, From, {error, stopped}}], {keep_state_and_data, Actions}; handle_event({call, From}, health_check, _State, Data) -> - handle_health_check_event(From, Data). + handle_health_check_event(From, Data); +% Ignore all other events +handle_event(_, _, State, Data) -> + {next_state, State, Data}. %%------------------------------------------------------------------------------ %% internal functions From b5addf7e05e6502e279819650390dddf3217fe8b Mon Sep 17 00:00:00 2001 From: EMQ-YangM Date: Mon, 16 May 2022 12:30:48 +0800 Subject: [PATCH 2/4] fix: log all ignore events --- apps/emqx_resource/src/emqx_resource_manager.erl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/apps/emqx_resource/src/emqx_resource_manager.erl b/apps/emqx_resource/src/emqx_resource_manager.erl index 5ce4d0c45..41ff74f16 100644 --- a/apps/emqx_resource/src/emqx_resource_manager.erl +++ b/apps/emqx_resource/src/emqx_resource_manager.erl @@ -18,6 +18,7 @@ -include("emqx_resource.hrl"). -include("emqx_resource_utils.hrl"). +-include_lib("emqx/include/logger.hrl"). % API -export([ @@ -275,7 +276,17 @@ handle_event({call, From}, health_check, stopped, _Data) -> handle_event({call, From}, health_check, _State, Data) -> handle_health_check_event(From, Data); % Ignore all other events -handle_event(_, _, State, Data) -> +handle_event(EventType, EventData, State, Data) -> + ?SLOG( + error, + #{ + msg => "ignore all other events", + event_type => EventType, + event_data => EventData, + state => State, + data => Data + } + ), {next_state, State, Data}. %%------------------------------------------------------------------------------ From 561d8c391278d461817aa5cf63bdd9633ac37adb Mon Sep 17 00:00:00 2001 From: EMQ-YangM Date: Mon, 16 May 2022 16:36:54 +0800 Subject: [PATCH 3/4] fix: load connector schema --- apps/emqx_connector/test/emqx_connector_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_connector/test/emqx_connector_SUITE.erl b/apps/emqx_connector/test/emqx_connector_SUITE.erl index 5b6d20a40..6b749a3f9 100644 --- a/apps/emqx_connector/test/emqx_connector_SUITE.erl +++ b/apps/emqx_connector/test/emqx_connector_SUITE.erl @@ -53,7 +53,7 @@ init_per_suite(Config) -> emqx_bridge ] ), - + ok = emqx_common_test_helpers:load_config(emqx_connector_schema, <<"connectors: {}">>), Config. end_per_suite(_Config) -> From 574a40b327755ab1893fca4141295cfda75a0590 Mon Sep 17 00:00:00 2001 From: EMQ-YangM Date: Mon, 16 May 2022 17:00:42 +0800 Subject: [PATCH 4/4] fix: wait for test_resource stop --- apps/emqx_resource/test/emqx_resource_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_resource/test/emqx_resource_SUITE.erl b/apps/emqx_resource/test/emqx_resource_SUITE.erl index d0f6ffd45..0d5230dfa 100644 --- a/apps/emqx_resource/test/emqx_resource_SUITE.erl +++ b/apps/emqx_resource/test/emqx_resource_SUITE.erl @@ -318,7 +318,7 @@ t_create_dry_run_local(_) -> #{name => test_resource, register => true} ) ), - + timer:sleep(100), ?assertEqual(undefined, whereis(test_resource)). t_create_dry_run_local_failed(_) ->