Merge pull request #11238 from ieQu1/customer-e502/patch

chore(ekka): Update version to 0.15.5
fix: Dialyzer
2023-07-12 16:50:33 +02:00 · 2023-07-12 11:06:46 +02:00 · 2023-07-12 10:32:25 +02:00 · 2023-07-11 11:32:06 +02:00 · 2023-07-10 12:26:50 +02:00 · 2023-05-23 17:01:31 +08:00
15 changed files with 55 additions and 56 deletions
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@ -104,7 +104,7 @@ jobs:
    - name: unzip source code
      run: Expand-Archive -Path source.zip -DestinationPath ./
    - uses: ilammy/msvc-dev-cmd@v1.12.0
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - name: build
--- a/.github/workflows/build_slim_packages.yaml
+++ b/.github/workflows/build_slim_packages.yaml
@ -96,7 +96,7 @@ jobs:
    steps:
    - uses: actions/checkout@v3
    - uses: ilammy/msvc-dev-cmd@v1.12.0
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: ${{ matrix.otp }}
    - name: build
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@ -58,7 +58,7 @@ jobs:
        arch:
          - amd64
    steps:
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - uses: actions/download-artifact@v3
@ -133,7 +133,7 @@ jobs:
      # - emqx-enterprise # TODO test enterprise

    steps:
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - uses: actions/download-artifact@v3
--- a/.github/workflows/run_jmeter_tests.yaml
+++ b/.github/workflows/run_jmeter_tests.yaml
@ -14,7 +14,7 @@ jobs:
    outputs:
      version: ${{ steps.build_docker.outputs.version}}
    steps:
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - name: download jmeter
@ -57,7 +57,7 @@ jobs:

    needs: build_emqx_for_jmeter_tests
    steps:
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - uses: actions/checkout@v3
@ -153,7 +153,7 @@ jobs:

    needs: build_emqx_for_jmeter_tests
    steps:
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - uses: actions/checkout@v3
@ -259,7 +259,7 @@ jobs:

    needs: build_emqx_for_jmeter_tests
    steps:
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - uses: actions/checkout@v3
@ -361,7 +361,7 @@ jobs:

    needs: build_emqx_for_jmeter_tests
    steps:
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - uses: actions/checkout@v3
@ -460,7 +460,7 @@ jobs:

    needs: build_emqx_for_jmeter_tests
    steps:
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - uses: actions/checkout@v3
--- a/.github/workflows/run_relup_tests.yaml
+++ b/.github/workflows/run_relup_tests.yaml
@ -71,7 +71,7 @@ jobs:
        shell: bash
    steps:
      # setup Erlang to run lux
-    - uses: erlef/setup-beam@v1.15.2
+    - uses: erlef/setup-beam@v1.16.0
      with:
        otp-version: 24.3.4.6
    - uses: actions/checkout@v3
--- a/13
+++ b/13
@ -4,8 +4,6 @@ SCRIPTS = $(CURDIR)/scripts
 export EMQX_RELUP ?= true
 export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-28:1.13.4-24.3.4.2-2-debian11
 export EMQX_DEFAULT_RUNNER = debian:11-slim
-export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh)
-export ELIXIR_VSN ?= $(shell $(CURDIR)/scripts/get-elixir-vsn.sh)
 export EMQX_DASHBOARD_VERSION ?= v1.2.1
 export EMQX_EE_DASHBOARD_VERSION ?= e1.0.5
 export EMQX_REL_FORM ?= tgz
@ -17,6 +15,17 @@ else
 	FIND=find
 endif

+# `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used
+# In make 4.4+, for backward-compatibility the value from the original environment is used.
+# so the shell script will be executed tons of times.
+# https://github.com/emqx/emqx/pull/10627
+ifeq ($(strip $(OTP_VSN)),)
+    export OTP_VSN := $(shell $(SCRIPTS)/get-otp-vsn.sh)
+endif
+ifeq ($(strip $(ELIXIR_VSN)),)
+    export ELIXIR_VSN := $(shell $(SCRIPTS)/get-elixir-vsn.sh)
+endif
+
 PROFILE ?= emqx
 REL_PROFILES := emqx emqx-enterprise
 PKG_PROFILES := emqx-pkg emqx-enterprise-pkg
--- a/apps/emqx/include/emqx.hrl
+++ b/apps/emqx/include/emqx.hrl
@ -25,13 +25,6 @@
 -define(ROUTE_SHARD, route_shard).
 -define(PERSISTENT_SESSION_SHARD, emqx_persistent_session_shard).

-define(BOOT_SHARDS, [
-    ?ROUTE_SHARD,
-    ?COMMON_SHARD,
-    ?SHARED_SUB_SHARD,
-    ?PERSISTENT_SESSION_SHARD
-]).
-
 %% Banner
 %%--------------------------------------------------------------------

--- a/apps/emqx/include/emqx_release.hrl
+++ b/apps/emqx/include/emqx_release.hrl
@ -35,7 +35,7 @@
 -define(EMQX_RELEASE_CE, "5.0.21").

 %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.0.2").
+-define(EMQX_RELEASE_EE, "5.0.2-patch-01").

 %% the HTTP API version
 -define(EMQX_API_VERSION, "5.0").
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@ -27,7 +27,7 @@
    {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}},
    {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}},
    {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.4"}}},
-    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.5"}}},
+    {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.5"}}},
    {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
    {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.37.2"}}},
    {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}},
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@ -3,7 +3,7 @@
    {id, "emqx"},
    {description, "EMQX Core"},
    % strict semver, bump manually!
-    {vsn, "5.0.21"},
+    {vsn, "5.0.22"},
    {modules, []},
    {registered, []},
    {applications, [
--- a/apps/emqx/src/emqx_app.erl
+++ b/apps/emqx/src/emqx_app.erl
@ -44,7 +44,6 @@ start(_Type, _Args) ->
    ok = emqx_persistent_session:init_db_backend(),
    ok = maybe_start_quicer(),
    ok = emqx_bpapi:start(),
-    wait_boot_shards(),
    ok = emqx_alarm_handler:load(),
    {ok, Sup} = emqx_sup:start_link(),
    ok = maybe_start_listeners(),
@ -60,9 +59,6 @@ prep_stop(_State) ->

 stop(_State) -> ok.

-wait_boot_shards() ->
-    ok = mria_rlog:wait_for_shards(?BOOT_SHARDS, infinity).
-
 %% @doc Call this function to make emqx boot without loading config,
 %% in case we want to delegate the config load to a higher level app
 %% which manages emqx app.
--- a/apps/emqx_machine/src/emqx_machine.app.src
+++ b/apps/emqx_machine/src/emqx_machine.app.src
@ -3,7 +3,7 @@
    {id, "emqx_machine"},
    {description, "The EMQX Machine"},
    % strict semver, bump manually!
-    {vsn, "0.2.1"},
+    {vsn, "0.2.2"},
    {modules, []},
    {registered, []},
    {applications, [kernel, stdlib, emqx_ctl]},
--- a/apps/emqx_machine/src/emqx_machine_boot.erl
+++ b/apps/emqx_machine/src/emqx_machine_boot.erl
@ -126,7 +126,6 @@ reboot_apps() ->
    BaseRebootApps ++ ConfigApps.

 basic_reboot_apps() ->
-    CE =
    ?BASIC_REBOOT_APPS ++
        [
            emqx_prometheus,
@ -147,11 +146,13 @@ basic_reboot_apps() ->
            emqx_slow_subs,
            emqx_auto_subscribe,
            emqx_plugins
-            ],
-    case emqx_release:edition() of
-        ce -> CE;
-        ee -> CE ++ []
-    end.
+        ] ++ basic_reboot_apps_enterprise(emqx_release:edition()).
+
+-dialyzer({nowarn_function, basic_reboot_apps_enterprise/1}).
+basic_reboot_apps_enterprise(ee) ->
+    [emqx_license];
+basic_reboot_apps_enterprise(_) ->
+    [].

 sorted_reboot_apps() ->
    Apps = [{App, app_deps(App)} || App <- reboot_apps()],
--- a/mix.exs
+++ b/mix.exs
@ -54,7 +54,7 @@ defmodule EMQXUmbrella.MixProject do
      {:cowboy, github: "emqx/cowboy", tag: "2.9.0", override: true},
      {:esockd, github: "emqx/esockd", tag: "5.9.4", override: true},
      {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.7.2-emqx-9", override: true},
-      {:ekka, github: "emqx/ekka", tag: "0.14.5", override: true},
+      {:ekka, github: "emqx/ekka", tag: "0.15.5", 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},
--- a/rebar.config
+++ b/rebar.config
@ -56,7 +56,7 @@
    , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}}
    , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.4"}}}
    , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.7.2-emqx-9"}}}
-    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.5"}}}
+    , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.5"}}}
    , {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"}}}
Author	SHA1	Message	Date
ieQu1	f37d9739a5	Merge pull request #11238 from ieQu1/customer-e502/patch chore(ekka): Update version to 0.15.5	2023-07-12 16:50:33 +02:00
ieQu1	2808523419	fix: Dialyzer	2023-07-12 11:06:46 +02:00
ieQu1	7fdcca784d	fix: Disable waiting for shards on boot	2023-07-12 10:32:25 +02:00
ieQu1	6aca61d121	chore: Fix CI	2023-07-11 11:32:06 +02:00
ieQu1	71f73f68d1	chore(ekka): Update version to 0.15.5	2023-07-10 12:26:50 +02:00
JimMoen	6c36152612	fix: reboot `emqx_license` app for join cluster	2023-05-23 17:01:31 +08:00
JimMoen	326c71205d	chore: compatibility make 4.4+ Port from [PR#10627](https://github.com/emqx/emqx/pull/10627).	2023-05-23 16:54:17 +08:00