Merge pull request #9946 from zmstone/0209-fix-add-back-deprecate-field

fix(config): add back reconnect_interval field as deprecated

apps/emqx_bridge/test/emqx_bridge_compatible_config_tests.erl

@@ -177,6 +177,7 @@ bridges {
         keepalive = \"60s\"
         mode = cluster_shareload
         proto_ver = \"v4\"
+        reconnect_interval = \"15s\"
         server = \"localhost:1883\"
         ssl {enable = false, verify = \"verify_peer\"}
       }
@@ -194,6 +195,7 @@ bridges {
         keepalive = \"60s\"
         mode = \"cluster_shareload\"
         proto_ver = \"v4\"
+        reconnect_interval = \"15s\"
         server = \"localhost:1883\"
         ssl {enable = false, verify = \"verify_peer\"}
       }

apps/emqx_connector/src/emqx_connector.app.src

@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_connector, [
     {description, "EMQX Data Integration Connectors"},
-    {vsn, "0.1.13"},
+    {vsn, "0.1.14"},
     {registered, []},
     {mod, {emqx_connector_app, []}},
     {applications, [

apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl

@@ -72,6 +72,7 @@ fields("server_configs") ->
             )},
         {server, emqx_schema:servers_sc(#{desc => ?DESC("server")}, ?MQTT_HOST_OPTS)},
         {clientid_prefix, mk(binary(), #{required => false, desc => ?DESC("clientid_prefix")})},
+        {reconnect_interval, mk(string(), #{deprecated => {since, "v5.0.16"}})},
         {proto_ver,
             mk(
                 hoconsc:enum([v3, v4, v5]),

changes/v5.0.17/fix-9946.en.md

@@ -0,0 +1,3 @@
+Add back `reconnect_interval` as deprecated field for MQTT bridge.
+The field was removed from v5.0.16/e5.0.0 by mistake, caused new version unable to start on old config.
+Now it's added back as deprecated (config value is ignored if provided).

changes/v5.0.17/fix-9946.zh.md

@@ -0,0 +1,2 @@
+MQTT 桥接配置参数 `reconnect_interval` 在 v5.0.16/e5.0.0 中被错误删除，
+导致旧版本配置在升级后无法使用。此修复把配置加回，但是值会忽略。