Merge pull request #13886 from lafirest/fix/iotdb_ssl

fix(iotdb): set the default timeout for the Thrift driver to avoid getting stuck

apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb_connector.erl

@@ -75,6 +75,7 @@
 
 -define(CONNECTOR_TYPE, iotdb).
 -define(IOTDB_PING_PATH, <<"ping">>).
+-define(DEFAULT_THRIFT_TIMEOUT, timer:seconds(10)).
 
 -import(hoconsc, [mk/2, enum/1, ref/2]).
 
@@ -187,6 +188,22 @@ fields("config_thrift") ->
                         default => 8,
                         desc => ?DESC("pool_size")
                     }
+                )},
+            {connect_timeout,
+                mk(
+                    emqx_schema:timeout_duration_ms(),
+                    #{
+                        default => <<"10s">>,
+                        desc => ?DESC("connect_timeout")
+                    }
+                )},
+            {recv_timeout,
+                mk(
+                    emqx_schema:timeout_duration_ms(),
+                    #{
+                        default => <<"10s">>,
+                        desc => ?DESC("recv_timeout")
+                    }
                 )}
         ] ++ fields(authentication) ++ emqx_connector_schema_lib:ssl_fields() ++
         emqx_connector_schema:resource_opts_ref(?MODULE, connector_resource_opts);
@@ -317,22 +334,29 @@ on_start(
 
     #{hostname := Host, port := Port} = emqx_schema:parse_server(Server, ?THRIFT_HOST_OPTIONS),
 
-    TransportOpts =
+    DriverOpts = maps:merge(
+        #{
+            connect_timeout => ?DEFAULT_THRIFT_TIMEOUT, recv_timeout => ?DEFAULT_THRIFT_TIMEOUT
+        },
+        maps:with([connect_timeout, recv_timeout], Config)
+    ),
+
+    DriverOpts1 =
         case maps:get(enable, SSL) of
             true ->
-                #{
+                DriverOpts#{
                     ssltransport => true,
                     ssloptions => emqx_tls_lib:to_client_opts(SSL)
                 };
             false ->
-                #{}
+                DriverOpts
         end,
 
     IoTDBOpts = IoTDBOpts0#{
         version => Version,
         host => Host,
         port => Port,
-        options => TransportOpts
+        options => DriverOpts1
     },
 
     Options = [

rel/i18n/emqx_bridge_iotdb_connector.hocon

@@ -58,4 +58,10 @@ config_zoneId.desc:
 pool_size.desc:
 """Size for the IoTDB Thrift connection pool"""
 
+connect_timeout.desc:
+"""Timeout for connecting to the IoTDB Thrift server"""
+
+recv_timeout.desc:
+"""Timeout for IoTDB Thrift server response"""
+
 }