From 99e892b5c4de941139b480c6de89c0dd62d90857 Mon Sep 17 00:00:00 2001
From: Serge Tupchii <serge.tupchii@protonmail.com>
Date: Mon, 24 Apr 2023 20:29:38 +0300
Subject: [PATCH] chore: bump ekka to 0.15.0

ekka 0.15.0 uses mria 0.5.0, which adds several fixes, enhancements and features:
  - protect `mria:join/1,2` with a global lock
  - implement new function `mria:sync_transaction/4,3,2`, which waits for
    a transaction replication to be ready on the local node
    (if the local node is a replicant)
  - optimize `mria:running_nodes/0`
  - optimize `mria:ro_transaction/2` when called on a replicant node.

Fixes: EMQX-9588 (#10380), EMQX-9102, EMQX-9152, EMQX-9213
---
 apps/emqx/rebar.config     |  2 +-
 changes/ce/fix-10500.en.md | 12 ++++++++++++
 mix.exs                    |  2 +-
 rebar.config               |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 changes/ce/fix-10500.en.md

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 6788b4f40..21b2fd292 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -27,7 +27,7 @@
     {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}},
     {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}},
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}},
-    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.6"}}},
+    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.0"}}},
     {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
     {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.39.2"}}},
     {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}},
diff --git a/changes/ce/fix-10500.en.md b/changes/ce/fix-10500.en.md
new file mode 100644
index 000000000..730dfb6e5
--- /dev/null
+++ b/changes/ce/fix-10500.en.md
@@ -0,0 +1,12 @@
+Add several fixes, enhancements and features in Mria:
+  - protect `mria:join/1,2` with a global lock to prevent conflicts between
+    two nodes trying to join each other simultaneously
+    [Mria PR](https://github.com/emqx/mria/pull/137)
+  - implement new function `mria:sync_transaction/4,3,2`, which blocks the caller until
+    a transaction is imported to the local node (if the local node is a replicant, otherwise,
+    it behaves exactly the same as `mria:transaction/3,2`)
+    [Mria PR](https://github.com/emqx/mria/pull/136)
+  - optimize `mria:running_nodes/0`
+    [Mria PR](https://github.com/emqx/mria/pull/135)
+  - optimize `mria:ro_transaction/2` when called on a replicant node
+    [Mria PR](https://github.com/emqx/mria/pull/134).
diff --git a/mix.exs b/mix.exs
index e2230d55d..ca4faabcd 100644
--- a/mix.exs
+++ b/mix.exs
@@ -55,7 +55,7 @@ defmodule EMQXUmbrella.MixProject do
       {:cowboy, github: "emqx/cowboy", tag: "2.9.0", override: true},
       {:esockd, github: "emqx/esockd", tag: "5.9.6", override: true},
       {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.7.2-emqx-9", override: true},
-      {:ekka, github: "emqx/ekka", tag: "0.14.6", override: true},
+      {:ekka, github: "emqx/ekka", tag: "0.15.0", override: true},
       {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true},
       {:grpc, github: "emqx/grpc-erl", tag: "0.6.7", override: true},
       {:minirest, github: "emqx/minirest", tag: "1.3.8", override: true},
diff --git a/rebar.config b/rebar.config
index de520f124..10adb3848 100644
--- a/rebar.config
+++ b/rebar.config
@@ -62,7 +62,7 @@
     , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}}
     , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}}
     , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.7.2-emqx-9"}}}
-    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.6"}}}
+    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.0"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}
     , {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.7"}}}
     , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.8"}}}