From ddb5bd23d69321a86bfb129ee65a8027383fc4a1 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Thu, 25 Aug 2022 10:57:26 +0800
Subject: [PATCH 1/2] fix: don't update manifest if not an exact tag

---
 .github/workflows/build_and_push_docker_images.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index a462a62da..344b694f3 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -221,7 +221,7 @@ jobs:
 
   docker-push-multi-arch-manifest:
     # note, we only run on amd64
-    if: ${{ needs.prepare.outputs.IS_EXACT_TAG }}
+    if: ${{ needs.prepare.outputs.IS_EXACT_TAG }} == 'true'
     needs:
       - prepare
       - docker
@@ -324,7 +324,7 @@ jobs:
             ${{ steps.pre-meta.outputs.img_labels }}
 
       - name: update manifest for multiarch image
-        if: ${{ needs.prepare.outputs.IS_EXACT_TAG }}
+        if: ${{ needs.prepare.outputs.IS_EXACT_TAG }} == 'true'
         working-directory: source
         run: |
           if [ ${{ matrix.build_elixir }} = 'with_elixir' ]; then

From 9327c0f51bf975ba85736d2c46d52ed0bf1c8119 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Thu, 25 Aug 2022 11:38:50 +0800
Subject: [PATCH 2/2] fix(mysql_bridge): export the query_mode option to the
 APIs

---
 apps/emqx_rule_engine/src/emqx_rule_runtime.erl    | 4 ++--
 lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl
index 3729d9096..2c2bfad4f 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_runtime.erl
@@ -509,10 +509,10 @@ inc_action_metrics(ok, RuleId) ->
 inc_action_metrics({ok, _}, RuleId) ->
     emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.success');
 inc_action_metrics({resource_down, _}, RuleId) ->
-    emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.out_of_service'),
+    emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.out_of_service'),
     emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.unknown');
 inc_action_metrics(?RESOURCE_ERROR_M(R, _), RuleId) when ?IS_RES_DOWN(R) ->
-    emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.out_of_service'),
+    emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.out_of_service'),
     emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.unknown');
 inc_action_metrics(_, RuleId) ->
     emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed'),
diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl
index cb7390760..e78d77fdb 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl
@@ -60,6 +60,7 @@ values(post) ->
             enable_batch => false,
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
+            query_mode => sync,
             enable_queue => false,
             max_queue_bytes => ?DEFAULT_QUEUE_SIZE
         }
@@ -120,7 +121,7 @@ desc(_) ->
 %% internal
 is_hidden_opts(Field) ->
     lists:member(Field, [
-        query_mode, async_inflight_window
+        async_inflight_window
     ]).
 
 type_field() ->