From f276ea9e91b196f3f5034d65479b761813991f5f Mon Sep 17 00:00:00 2001
From: Serge Tupchii <serge.tupchii@protonmail.com>
Date: Thu, 3 Aug 2023 13:24:22 +0300
Subject: [PATCH] fix: increase emqx_router_sup restart intensity

The goal is to tolerate occasional crashes that can happen under relatively normal conditions
and don't seem critical to shutdown the whole app (emqx).
For example, mria write/delete call delegated from a replicant to a core node may fail,
if the core node is being stopped / restarted / not ready.

Fixes: EMQX-10703, #11310
---
 apps/emqx/src/emqx.app.src        | 2 +-
 apps/emqx/src/emqx_router_sup.erl | 7 ++++++-
 changes/ce/fix-11388.en.md        | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 changes/ce/fix-11388.en.md

diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src
index cff8cf35b..d9598ee1b 100644
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@@ -2,7 +2,7 @@
 {application, emqx, [
     {id, "emqx"},
     {description, "EMQX Core"},
-    {vsn, "5.1.4"},
+    {vsn, "5.1.5"},
     {modules, []},
     {registered, []},
     {applications, [
diff --git a/apps/emqx/src/emqx_router_sup.erl b/apps/emqx/src/emqx_router_sup.erl
index d0e5ea05a..0fa48d9d2 100644
--- a/apps/emqx/src/emqx_router_sup.erl
+++ b/apps/emqx/src/emqx_router_sup.erl
@@ -41,4 +41,9 @@ init([]) ->
         hash,
         {emqx_router, start_link, []}
     ]),
-    {ok, {{one_for_all, 0, 1}, [Helper, RouterPool]}}.
+    SupFlags = #{
+        strategy => one_for_one,
+        intensity => 10,
+        period => 100
+    },
+    {ok, {SupFlags, [Helper, RouterPool]}}.
diff --git a/changes/ce/fix-11388.en.md b/changes/ce/fix-11388.en.md
new file mode 100644
index 000000000..835155585
--- /dev/null
+++ b/changes/ce/fix-11388.en.md
@@ -0,0 +1,6 @@
+Increase `emqx_router_sup` restart intensity.
+
+The goal is to tolerate occasional crashes that can happen under relatively normal conditions
+and don't seem critical to shutdown the whole app (emqx).
+For example, mria write/delete call delegated from a replicant to a core node by `emqx_router_helper` may fail,
+if the core node is being stopped / restarted / not ready.