From 1bf33f75cc9f2f0196e8b5112eb6a3f2d45d84f0 Mon Sep 17 00:00:00 2001
From: EMQ-YangM <yangm@emqx.io>
Date: Fri, 29 Apr 2022 16:37:04 +0800
Subject: [PATCH 1/2] fix: set resource status disconnected

---
 .../src/emqx_resource_health_check.erl        |  2 +-
 .../src/emqx_resource_instance.erl            | 28 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_resource/src/emqx_resource_health_check.erl b/apps/emqx_resource/src/emqx_resource_health_check.erl
index ab74296a5..ac03c3c35 100644
--- a/apps/emqx_resource/src/emqx_resource_health_check.erl
+++ b/apps/emqx_resource/src/emqx_resource_health_check.erl
@@ -98,7 +98,7 @@ health_check_timeout_checker(Pid, Name, SleepTime, Timeout) ->
             #{name => Name},
             <<Name/binary, " health check timeout">>
         ),
-        emqx_resource:set_resource_status_connecting(Name),
+        _ = emqx_resouce_instance:set_resource_status(Name, disconnected),
         receive
             health_check_finish -> timer:sleep(SleepTime)
         end
diff --git a/apps/emqx_resource/src/emqx_resource_instance.erl b/apps/emqx_resource/src/emqx_resource_instance.erl
index a52c6d229..67ff4637a 100644
--- a/apps/emqx_resource/src/emqx_resource_instance.erl
+++ b/apps/emqx_resource/src/emqx_resource_instance.erl
@@ -19,6 +19,7 @@
 
 -include("emqx_resource.hrl").
 -include("emqx_resource_utils.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -export([start_link/2]).
 
@@ -28,7 +29,8 @@
     get_metrics/1,
     reset_metrics/1,
     list_all/0,
-    list_group/1
+    list_group/1,
+    set_resource_status/2
 ]).
 
 -export([
@@ -339,6 +341,30 @@ do_set_resource_status_connecting(InstId) ->
             {error, Error}
     end.
 
+-spec set_resource_status(instance_id(), resource_connection_status()) -> ok | {error, term()}.
+set_resource_status(InstId, Status) ->
+    case lookup(InstId) of
+        {ok, Group, #{id := _} = Data} ->
+            ?SLOG(
+                error,
+                #{
+                    msg => "health check failed: timeout",
+                    resource_id => InstId
+                }
+            ),
+            update_resource(InstId, Group, Data#{status => Status});
+        Error ->
+            ?SLOG(
+                error,
+                #{
+                    msg => "set resource status field",
+                    resource_id => InstId,
+                    reason => Error
+                }
+            ),
+            Error
+    end.
+
 %%------------------------------------------------------------------------------
 %% internal functions
 %%------------------------------------------------------------------------------

From c52b464b3c7cd36e9d3e51fdf1db992e4f6a86a5 Mon Sep 17 00:00:00 2001
From: EMQ-YangM <yangm@emqx.io>
Date: Fri, 29 Apr 2022 17:07:42 +0800
Subject: [PATCH 2/2] fix: check process alive before health check

---
 apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl   |  6 ++++--
 apps/emqx_resource/src/emqx_resource_health_check.erl | 11 ++++++++++-
 apps/emqx_resource/src/emqx_resource_instance.erl     |  7 -------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl b/apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl
index e6a7ad366..4358999a5 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs_pool.erl
@@ -68,8 +68,10 @@ get_status(PoolName, CheckFunc, AutoReconn) when is_function(CheckFunc) ->
     Status = [
         begin
             case ecpool_worker:client(Worker) of
-                {ok, Conn} -> CheckFunc(Conn);
-                _ -> false
+                {ok, Conn} ->
+                    erlang:is_process_alive(Conn) andalso CheckFunc(Conn);
+                _ ->
+                    false
             end
         end
      || {_WorkerName, Worker} <- ecpool:workers(PoolName)
diff --git a/apps/emqx_resource/src/emqx_resource_health_check.erl b/apps/emqx_resource/src/emqx_resource_health_check.erl
index ac03c3c35..265592582 100644
--- a/apps/emqx_resource/src/emqx_resource_health_check.erl
+++ b/apps/emqx_resource/src/emqx_resource_health_check.erl
@@ -15,6 +15,8 @@
 %%--------------------------------------------------------------------
 -module(emqx_resource_health_check).
 
+-include_lib("emqx/include/logger.hrl").
+
 -export([
     start_link/3,
     create_checker/3,
@@ -98,7 +100,14 @@ health_check_timeout_checker(Pid, Name, SleepTime, Timeout) ->
             #{name => Name},
             <<Name/binary, " health check timeout">>
         ),
-        _ = emqx_resouce_instance:set_resource_status(Name, disconnected),
+        ?SLOG(
+            error,
+            #{
+                msg => "health check failed: timeout",
+                name => Name
+            }
+        ),
+        _ = emqx_resource_instance:set_resource_status(Name, disconnected),
         receive
             health_check_finish -> timer:sleep(SleepTime)
         end
diff --git a/apps/emqx_resource/src/emqx_resource_instance.erl b/apps/emqx_resource/src/emqx_resource_instance.erl
index 67ff4637a..eb72fff1b 100644
--- a/apps/emqx_resource/src/emqx_resource_instance.erl
+++ b/apps/emqx_resource/src/emqx_resource_instance.erl
@@ -345,13 +345,6 @@ do_set_resource_status_connecting(InstId) ->
 set_resource_status(InstId, Status) ->
     case lookup(InstId) of
         {ok, Group, #{id := _} = Data} ->
-            ?SLOG(
-                error,
-                #{
-                    msg => "health check failed: timeout",
-                    resource_id => InstId
-                }
-            ),
             update_resource(InstId, Group, Data#{status => Status});
         Error ->
             ?SLOG(