From 768ab4eacdd60d2edb1e1c6ec1958ec2a91c54fb Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Wed, 17 Aug 2022 16:03:42 +0800
Subject: [PATCH] fix(bridge): mqtt bridge worker status idle

---
 .../src/emqx_bridge_mqtt.app.src              |  2 +-
 .../src/emqx_bridge_mqtt.appup.src            |  4 ++--
 .../src/emqx_bridge_mqtt_actions.erl          | 23 +++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
index 31c795ff5..578671f4e 100644
--- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
+++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
@@ -1,6 +1,6 @@
 {application, emqx_bridge_mqtt,
  [{description, "EMQ X Bridge to MQTT Broker"},
-  {vsn, "4.3.5"}, % strict semver, bump manually!
+  {vsn, "4.3.6"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
   {applications, [kernel,stdlib,replayq,emqtt]},
diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.appup.src b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.appup.src
index 9e1eda7f4..a72a18658 100644
--- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.appup.src
+++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.appup.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.3.4",
+  [{<<"4\\.3\\.[4-5]">>,
     [{load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.3",
     [{load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]},
@@ -14,7 +14,7 @@
      {load_module,emqx_bridge_worker,brutal_purge,soft_purge,[]},
      {load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.3.4",
+  [{<<"4\\.3\\.[4-5]">>,
     [{load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]}]},
    {"4.3.3",
     [{load_module,emqx_bridge_mqtt_actions,brutal_purge,soft_purge,[]},
diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl
index 941ad51d0..a2b88352e 100644
--- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl
+++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl
@@ -433,7 +433,7 @@ test_resource_status(PoolName) ->
     try
         Status = [
             receive {Pid, R} -> R
-            after 1000 -> %% get_worker_status/1 should be a quick operation
+            after 10000 -> %% get_worker_status/1 should be a quick operation
                 throw({timeout, Pid})
             end || Pid <- Pids],
         lists:any(fun(St) -> St =:= true end, Status)
@@ -444,13 +444,28 @@ test_resource_status(PoolName) ->
             false
     end.
 
+-define(RETRY_TIMES, 4).
+
 get_worker_status(Worker) ->
+    get_worker_status(Worker, ?RETRY_TIMES).
+
+get_worker_status(_Worker, 0) ->
+    false;
+get_worker_status(Worker, Times) ->
     case ecpool_worker:client(Worker) of
         {ok, Bridge} ->
             try emqx_bridge_worker:status(Bridge) of
-                connected -> true;
-                _ -> false
-            catch _Error:_Reason ->
+                connected ->
+                    true;
+                idle ->
+                    ?LOG(info, "MQTT Bridge get status idle. Should not ignore this."),
+                    timer:sleep(100),
+                    get_worker_status(Worker, Times - 1);
+                ErrorStatus ->
+                    ?LOG(error, "MQTT Bridge get status ~p", [ErrorStatus]),
+                    false
+            catch Error:Reason:ST ->
+                    ?LOG(error, "MQTT Bridge get status error: ~p reason: ~p stacktrace: ~p", [Error, Reason, ST]),
                     false
             end;
         {error, _} ->