Merge pull request #9717 from zmstone/0110-do-not-start-resource-after-recreate-if-disabled

fix(emqx_resource_manager): do not start when disabled

apps/emqx_bridge/src/emqx_bridge_resource.erl

@@ -132,13 +132,14 @@ create(BridgeId, Conf) ->
 create(Type, Name, Conf) ->
     create(Type, Name, Conf, #{}).
 
-create(Type, Name, Conf, Opts) ->
+create(Type, Name, Conf, Opts0) ->
     ?SLOG(info, #{
         msg => "create bridge",
         type => Type,
         name => Name,
         config => Conf
     }),
+    Opts = override_start_after_created(Conf, Opts0),
     {ok, _Data} = emqx_resource:create_local(
         resource_id(Type, Name),
         <<"emqx_bridge">>,
@@ -146,7 +147,7 @@ create(Type, Name, Conf, Opts) ->
         parse_confs(bin(Type), Name, Conf),
         Opts
     ),
-    maybe_disable_bridge(Type, Name, Conf).
+    ok.
 
 update(BridgeId, {OldConf, Conf}) ->
     {BridgeType, BridgeName} = parse_bridge_id(BridgeId),
@@ -155,7 +156,7 @@ update(BridgeId, {OldConf, Conf}) ->
 update(Type, Name, {OldConf, Conf}) ->
     update(Type, Name, {OldConf, Conf}, #{}).
 
-update(Type, Name, {OldConf, Conf}, Opts) ->
+update(Type, Name, {OldConf, Conf}, Opts0) ->
     %% TODO: sometimes its not necessary to restart the bridge connection.
     %%
     %% - if the connection related configs like `servers` is updated, we should restart/start
@@ -164,6 +165,7 @@ update(Type, Name, {OldConf, Conf}, Opts) ->
     %% the `method` or `headers` of a WebHook is changed, then the bridge can be updated
     %% without restarting the bridge.
     %%
+    Opts = override_start_after_created(Conf, Opts0),
     case emqx_map_lib:if_only_to_toggle_enable(OldConf, Conf) of
         false ->
             ?SLOG(info, #{
@@ -174,10 +176,10 @@ update(Type, Name, {OldConf, Conf}, Opts) ->
             }),
             case recreate(Type, Name, Conf, Opts) of
                 {ok, _} ->
-                    maybe_disable_bridge(Type, Name, Conf);
+                    ok;
                 {error, not_found} ->
                     ?SLOG(warning, #{
-                        msg => "updating_a_non-exist_bridge_need_create_a_new_one",
+                        msg => "updating_a_non_existing_bridge",
                         type => Type,
                         name => Name,
                         config => Conf
@@ -242,12 +244,6 @@ remove(Type, Name, _Conf, _Opts) ->
         {error, Reason} -> {error, Reason}
     end.
 
-maybe_disable_bridge(Type, Name, Conf) ->
-    case maps:get(enable, Conf, true) of
-        false -> stop(Type, Name);
-        true -> ok
-    end.
-
 maybe_clear_certs(TmpPath, #{ssl := SslConf} = Conf) ->
     %% don't remove the cert files if they are in use
     case is_tmp_path_conf(TmpPath, SslConf) of
@@ -321,3 +317,8 @@ str(Str) when is_list(Str) -> Str.
 bin(Bin) when is_binary(Bin) -> Bin;
 bin(Str) when is_list(Str) -> list_to_binary(Str);
 bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8).
+
+override_start_after_created(Config, Opts) ->
+    Enabled = maps:get(enable, Config, true),
+    StartAfterCreated = Enabled andalso maps:get(start_after_created, Opts, Enabled),
+    Opts#{start_after_created => StartAfterCreated}.

apps/emqx_resource/src/emqx_resource_manager.erl

@@ -112,7 +112,7 @@ recreate(ResId, ResourceType, NewConfig, Opts) ->
     end.
 
 create_and_return_data(MgrId, ResId, Group, ResourceType, Config, Opts) ->
-    create(MgrId, ResId, Group, ResourceType, Config, Opts),
+    _ = create(MgrId, ResId, Group, ResourceType, Config, Opts),
     {ok, _Group, Data} = lookup(ResId),
     {ok, Data}.
 
@@ -304,7 +304,7 @@ init({Data, Opts}) ->
     process_flag(trap_exit, true),
     %% init the cache so that lookup/1 will always return something
     insert_cache(Data#data.id, Data#data.group, Data),
-    case maps:get(start_after_created, Opts, true) of
+    case maps:get(start_after_created, Opts, ?START_AFTER_CREATED) of
         true -> {ok, connecting, Data, {next_event, internal, start_resource}};
         false -> {ok, stopped, Data}
     end.

changes/v5.0.14/fix-9717.en.md

@@ -0,0 +1 @@
+Prior to this fix, if it always times out when trying to connect a bridge server, it's not possible to change other configs even when the bridge is disabled.

changes/v5.0.14/fix-9717.zh.md

@@ -0,0 +1 @@
+修复已禁用的桥接资源服务器连接超时的情况下不能修改其他配置参数的问题。