Merge pull request #10273 from thalesmg/refactor-kprod-start-error-msg-rv50
fix: return friendly message when kafka producer and consumer fails to start (rv5.0)
This commit is contained in:
commit
246a792965
|
@ -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.10"},
|
{vsn, "0.1.11"},
|
||||||
{registered, []},
|
{registered, []},
|
||||||
{mod, {emqx_resource_app, []}},
|
{mod, {emqx_resource_app, []}},
|
||||||
{applications, [
|
{applications, [
|
||||||
|
|
|
@ -356,7 +356,14 @@ is_buffer_supported(Module) ->
|
||||||
-spec call_start(manager_id(), module(), resource_config()) ->
|
-spec call_start(manager_id(), module(), resource_config()) ->
|
||||||
{ok, resource_state()} | {error, Reason :: term()}.
|
{ok, resource_state()} | {error, Reason :: term()}.
|
||||||
call_start(MgrId, Mod, Config) ->
|
call_start(MgrId, Mod, Config) ->
|
||||||
?SAFE_CALL(Mod:on_start(MgrId, Config)).
|
try
|
||||||
|
Mod:on_start(MgrId, Config)
|
||||||
|
catch
|
||||||
|
throw:Error ->
|
||||||
|
{error, Error};
|
||||||
|
Kind:Error:Stacktrace ->
|
||||||
|
{error, #{exception => Kind, reason => Error, stacktrace => Stacktrace}}
|
||||||
|
end.
|
||||||
|
|
||||||
-spec call_health_check(manager_id(), module(), resource_state()) ->
|
-spec call_health_check(manager_id(), module(), resource_state()) ->
|
||||||
resource_status()
|
resource_status()
|
||||||
|
|
|
@ -95,6 +95,11 @@
|
||||||
commit_fun => brod_group_subscriber_v2:commit_fun()
|
commit_fun => brod_group_subscriber_v2:commit_fun()
|
||||||
}.
|
}.
|
||||||
|
|
||||||
|
-define(CLIENT_DOWN_MESSAGE,
|
||||||
|
"Failed to start Kafka client. Please check the logs for errors and check"
|
||||||
|
" the connection parameters."
|
||||||
|
).
|
||||||
|
|
||||||
%%-------------------------------------------------------------------------------------
|
%%-------------------------------------------------------------------------------------
|
||||||
%% `emqx_resource' API
|
%% `emqx_resource' API
|
||||||
%%-------------------------------------------------------------------------------------
|
%%-------------------------------------------------------------------------------------
|
||||||
|
@ -152,7 +157,7 @@ on_start(InstanceId, Config) ->
|
||||||
kafka_hosts => BootstrapHosts,
|
kafka_hosts => BootstrapHosts,
|
||||||
reason => emqx_misc:redact(Reason)
|
reason => emqx_misc:redact(Reason)
|
||||||
}),
|
}),
|
||||||
throw(failed_to_start_kafka_client)
|
throw(?CLIENT_DOWN_MESSAGE)
|
||||||
end,
|
end,
|
||||||
start_consumer(Config, InstanceId, ClientID).
|
start_consumer(Config, InstanceId, ClientID).
|
||||||
|
|
||||||
|
@ -173,7 +178,7 @@ on_get_status(_InstanceID, State) ->
|
||||||
kafka_client_id := ClientID,
|
kafka_client_id := ClientID,
|
||||||
kafka_topics := KafkaTopics
|
kafka_topics := KafkaTopics
|
||||||
} = State,
|
} = State,
|
||||||
do_get_status(ClientID, KafkaTopics, SubscriberId).
|
do_get_status(State, ClientID, KafkaTopics, SubscriberId).
|
||||||
|
|
||||||
%%-------------------------------------------------------------------------------------
|
%%-------------------------------------------------------------------------------------
|
||||||
%% `brod_group_subscriber' API
|
%% `brod_group_subscriber' API
|
||||||
|
@ -370,22 +375,41 @@ stop_client(ClientID) ->
|
||||||
),
|
),
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
do_get_status(ClientID, [KafkaTopic | RestTopics], SubscriberId) ->
|
do_get_status(State, ClientID, [KafkaTopic | RestTopics], SubscriberId) ->
|
||||||
case brod:get_partitions_count(ClientID, KafkaTopic) of
|
case brod:get_partitions_count(ClientID, KafkaTopic) of
|
||||||
{ok, NPartitions} ->
|
{ok, NPartitions} ->
|
||||||
case do_get_status(ClientID, KafkaTopic, SubscriberId, NPartitions) of
|
case do_get_status1(ClientID, KafkaTopic, SubscriberId, NPartitions) of
|
||||||
connected -> do_get_status(ClientID, RestTopics, SubscriberId);
|
connected -> do_get_status(State, ClientID, RestTopics, SubscriberId);
|
||||||
disconnected -> disconnected
|
disconnected -> disconnected
|
||||||
end;
|
end;
|
||||||
|
{error, {client_down, Context}} ->
|
||||||
|
case infer_client_error(Context) of
|
||||||
|
auth_error ->
|
||||||
|
Message = "Authentication error. " ++ ?CLIENT_DOWN_MESSAGE,
|
||||||
|
{disconnected, State, Message};
|
||||||
|
{auth_error, Message0} ->
|
||||||
|
Message = binary_to_list(Message0) ++ "; " ++ ?CLIENT_DOWN_MESSAGE,
|
||||||
|
{disconnected, State, Message};
|
||||||
|
connection_refused ->
|
||||||
|
Message = "Connection refused. " ++ ?CLIENT_DOWN_MESSAGE,
|
||||||
|
{disconnected, State, Message};
|
||||||
|
_ ->
|
||||||
|
{disconnected, State, ?CLIENT_DOWN_MESSAGE}
|
||||||
|
end;
|
||||||
|
{error, leader_not_available} ->
|
||||||
|
Message =
|
||||||
|
"Leader connection not available. Please check the Kafka topic used,"
|
||||||
|
" the connection parameters and Kafka cluster health",
|
||||||
|
{disconnected, State, Message};
|
||||||
_ ->
|
_ ->
|
||||||
disconnected
|
disconnected
|
||||||
end;
|
end;
|
||||||
do_get_status(_ClientID, _KafkaTopics = [], _SubscriberId) ->
|
do_get_status(_State, _ClientID, _KafkaTopics = [], _SubscriberId) ->
|
||||||
connected.
|
connected.
|
||||||
|
|
||||||
-spec do_get_status(brod:client_id(), binary(), subscriber_id(), pos_integer()) ->
|
-spec do_get_status1(brod:client_id(), binary(), subscriber_id(), pos_integer()) ->
|
||||||
connected | disconnected.
|
connected | disconnected.
|
||||||
do_get_status(ClientID, KafkaTopic, SubscriberId, NPartitions) ->
|
do_get_status1(ClientID, KafkaTopic, SubscriberId, NPartitions) ->
|
||||||
Results =
|
Results =
|
||||||
lists:map(
|
lists:map(
|
||||||
fun(N) ->
|
fun(N) ->
|
||||||
|
@ -504,3 +528,15 @@ encode(Value, base64) ->
|
||||||
|
|
||||||
to_bin(B) when is_binary(B) -> B;
|
to_bin(B) when is_binary(B) -> B;
|
||||||
to_bin(A) when is_atom(A) -> atom_to_binary(A, utf8).
|
to_bin(A) when is_atom(A) -> atom_to_binary(A, utf8).
|
||||||
|
|
||||||
|
infer_client_error(Error) ->
|
||||||
|
case Error of
|
||||||
|
[{_BrokerEndpoint, {econnrefused, _}} | _] ->
|
||||||
|
connection_refused;
|
||||||
|
[{_BrokerEndpoint, {{sasl_auth_error, Message}, _}} | _] when is_binary(Message) ->
|
||||||
|
{auth_error, Message};
|
||||||
|
[{_BrokerEndpoint, {{sasl_auth_error, _}, _}} | _] ->
|
||||||
|
auth_error;
|
||||||
|
_ ->
|
||||||
|
undefined
|
||||||
|
end.
|
||||||
|
|
|
@ -114,7 +114,10 @@ on_start(InstId, Config) ->
|
||||||
client_id => ClientId
|
client_id => ClientId
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
throw(failed_to_start_kafka_producer)
|
throw(
|
||||||
|
"Failed to start Kafka client. Please check the logs for errors and check"
|
||||||
|
" the connection parameters."
|
||||||
|
)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
on_stop(_InstanceID, #{client_id := ClientID, producers := Producers, resource_id := ResourceID}) ->
|
on_stop(_InstanceID, #{client_id := ClientID, producers := Producers, resource_id := ResourceID}) ->
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
-include_lib("eunit/include/eunit.hrl").
|
-include_lib("eunit/include/eunit.hrl").
|
||||||
-include_lib("common_test/include/ct.hrl").
|
-include_lib("common_test/include/ct.hrl").
|
||||||
|
-include_lib("snabbkaffe/include/snabbkaffe.hrl").
|
||||||
-include_lib("brod/include/brod.hrl").
|
-include_lib("brod/include/brod.hrl").
|
||||||
|
|
||||||
-define(PRODUCER, emqx_bridge_impl_kafka_producer).
|
-define(PRODUCER, emqx_bridge_impl_kafka_producer).
|
||||||
|
@ -415,9 +416,11 @@ t_failed_creation_then_fix(Config) ->
|
||||||
Type, erlang:list_to_atom(Name), WrongConf
|
Type, erlang:list_to_atom(Name), WrongConf
|
||||||
),
|
),
|
||||||
WrongConfigAtom = WrongConfigAtom1#{bridge_name => Name},
|
WrongConfigAtom = WrongConfigAtom1#{bridge_name => Name},
|
||||||
?assertThrow(failed_to_start_kafka_producer, ?PRODUCER:on_start(ResourceId, WrongConfigAtom)),
|
?assertThrow(Reason when is_list(Reason), ?PRODUCER:on_start(ResourceId, WrongConfigAtom)),
|
||||||
%% before throwing, it should cleanup the client process.
|
%% before throwing, it should cleanup the client process. we
|
||||||
?assertEqual([], supervisor:which_children(wolff_client_sup)),
|
%% retry because the supervisor might need some time to really
|
||||||
|
%% remove it from its tree.
|
||||||
|
?retry(50, 10, ?assertEqual([], supervisor:which_children(wolff_client_sup))),
|
||||||
%% must succeed with correct config
|
%% must succeed with correct config
|
||||||
{ok, #{config := ValidConfigAtom1}} = emqx_bridge:create(
|
{ok, #{config := ValidConfigAtom1}} = emqx_bridge:create(
|
||||||
Type, erlang:list_to_atom(Name), ValidConf
|
Type, erlang:list_to_atom(Name), ValidConf
|
||||||
|
|
Loading…
Reference in New Issue