diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 3141b77d5..fae593bd1 100644 --- 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 diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 163956790..4ac8d7ab5 100644 --- 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 diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index f729c8cbd..05fe6601b 100644 --- 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 diff --git a/.github/workflows/run_jmeter_tests.yaml b/.github/workflows/run_jmeter_tests.yaml index e402c7fed..54d296922 100644 --- 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 diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index cd969045d..ed53dcf23 100644 --- 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 diff --git a/apps/emqx/include/emqx.hrl b/apps/emqx/include/emqx.hrl index 64cd4687b..faf3f4828 100644 --- 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 %%-------------------------------------------------------------------- diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 2f5d1cb0c..e312699e2 100644 --- 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-patch-00"). +-define(EMQX_RELEASE_EE, "5.0.2-patch-01"). %% the HTTP API version -define(EMQX_API_VERSION, "5.0"). diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index a781a8a5a..d902d98d8 100644 --- 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"}}}, diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src index 1cecd7b61..7014c8381 100644 --- 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, [ diff --git a/apps/emqx/src/emqx_app.erl b/apps/emqx/src/emqx_app.erl index 6188d8030..79662a16b 100644 --- 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. diff --git a/apps/emqx_machine/src/emqx_machine_boot.erl b/apps/emqx_machine/src/emqx_machine_boot.erl index 324505a3b..4e14217e8 100644 --- a/apps/emqx_machine/src/emqx_machine_boot.erl +++ b/apps/emqx_machine/src/emqx_machine_boot.erl @@ -148,6 +148,7 @@ basic_reboot_apps() -> emqx_plugins ] ++ 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(_) -> diff --git a/mix.exs b/mix.exs index 6d76e23af..8abb8c079 100644 --- 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}, diff --git a/rebar.config b/rebar.config index 4ef9852b4..02b0640fc 100644 --- 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"}}}