From 4c28b9f839afe26ad66d09189e2e259ff22f3e83 Mon Sep 17 00:00:00 2001 From: William Yang Date: Mon, 13 Mar 2023 09:52:23 +0100 Subject: [PATCH 1/5] chore(test): use power of 2 recvbuff size in quic test Make msquic assertions happy while in debug mode. --- apps/emqx/test/emqx_quic_multistreams_SUITE.erl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/emqx/test/emqx_quic_multistreams_SUITE.erl b/apps/emqx/test/emqx_quic_multistreams_SUITE.erl index b0eefba0d..72904e653 100644 --- a/apps/emqx/test/emqx_quic_multistreams_SUITE.erl +++ b/apps/emqx/test/emqx_quic_multistreams_SUITE.erl @@ -1906,8 +1906,9 @@ t_listener_with_lowlevel_settings(_Config) -> %% not use since we are server %% tls_client_max_send_buffer, tls_server_max_send_buffer => 10240, - stream_recv_window_default => 1024, - stream_recv_buffer_default => 10240, + stream_recv_window_default => 16384 * 2, + %% there is one debug assertion: stream_recv_window_default > stream_recv_buffer_default + stream_recv_buffer_default => 16384, conn_flow_control_window => 1024, max_stateless_operations => 16, initial_window_packets => 1300, From fffb92ebb7263db676699d9e9fa36f41dc2d4cd7 Mon Sep 17 00:00:00 2001 From: William Yang Date: Mon, 13 Mar 2023 12:08:32 +0100 Subject: [PATCH 2/5] test(quic): make tc run independent --- apps/emqx/test/emqx_quic_multistreams_SUITE.erl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/emqx/test/emqx_quic_multistreams_SUITE.erl b/apps/emqx/test/emqx_quic_multistreams_SUITE.erl index 72904e653..642b5468c 100644 --- a/apps/emqx/test/emqx_quic_multistreams_SUITE.erl +++ b/apps/emqx/test/emqx_quic_multistreams_SUITE.erl @@ -190,6 +190,7 @@ end_per_group(_, Config) -> init_per_testcase(_, Config) -> emqx_common_test_helpers:start_apps([]), + start_emqx_quic(?config(port, Config)), Config. t_quic_sock(Config) -> @@ -1255,7 +1256,8 @@ t_multi_streams_shutdown_pub_data_stream(Config) -> }} ], PubRecvs - ). + ), + emqtt:stop(C). t_multi_streams_shutdown_sub_data_stream(Config) -> PubQos = ?config(pub_qos, Config), @@ -1302,7 +1304,8 @@ t_multi_streams_shutdown_sub_data_stream(Config) -> #{data_stream_socks := [_PubVia | _]} = proplists:get_value(extra, emqtt:info(C)), timer:sleep(500), %% Still alive - ?assert(is_list(emqtt:info(C))). + ?assert(is_list(emqtt:info(C))), + emqtt:stop(C). t_multi_streams_shutdown_ctrl_stream(Config) -> PubQos = ?config(pub_qos, Config), @@ -1406,7 +1409,8 @@ t_multi_streams_shutdown_ctrl_stream_then_reconnect(Config) -> quicer:shutdown_stream(Ctrlstream, ?config(stream_shutdown_flag, Config), 500, 100), timer:sleep(200), %% Client should not be closed - ?assert(is_list(emqtt:info(C))). + ?assert(is_list(emqtt:info(C))), + emqtt:stop(C). t_multi_streams_emqx_ctrl_kill(Config) -> erlang:process_flag(trap_exit, true), @@ -1526,6 +1530,7 @@ t_multi_streams_remote_shutdown(Config) -> {ok, C} = emqtt:start_link([ {proto_ver, v5}, {reconnect, false}, + {clientid, atom_to_binary(?FUNCTION_NAME)}, %% speedup test {connect_timeout, 5} | Config @@ -1563,7 +1568,6 @@ t_multi_streams_remote_shutdown(Config) -> {quic, _Conn, _Ctrlstream} = proplists:get_value(socket, emqtt:info(C)), ok = stop_emqx(), - start_emqx_quic(?config(port, Config)), %% Client should be closed assert_client_die(C). @@ -1620,10 +1624,9 @@ t_multi_streams_remote_shutdown_with_reconnect(Config) -> ok = stop_emqx(), timer:sleep(200), - start_emqx_quic(?config(port, Config)), - %% Client should be closed - ?assert(is_list(emqtt:info(C))). + ?assert(is_list(emqtt:info(C))), + emqtt:stop(C). t_conn_silent_close(Config) -> erlang:process_flag(trap_exit, true), From f9556e8e21ebd04d40328bdd00a8c98fd21107c3 Mon Sep 17 00:00:00 2001 From: Kinplemelon Date: Fri, 10 Mar 2023 17:08:29 +0800 Subject: [PATCH 3/5] chore: upgrade dashboard to v1.1.9 for ce --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2f7ab5244..998175eea 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-28:1.13.4-24.3.4.2-2 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.1.8 +export EMQX_DASHBOARD_VERSION ?= v1.1.9 export EMQX_EE_DASHBOARD_VERSION ?= e1.0.4 export EMQX_REL_FORM ?= tgz export QUICER_DOWNLOAD_FROM_RELEASE = 1 From 255117f2c4ff0b12a07d5eee18498641ffa9aacf Mon Sep 17 00:00:00 2001 From: Stefan Strigler Date: Tue, 14 Mar 2023 10:39:56 +0100 Subject: [PATCH 4/5] chore: bump vsn e5.0.2-alpha.1 --- apps/emqx/include/emqx_release.hrl | 2 +- deploy/charts/emqx-enterprise/Chart.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index a79389ecb..cdf2eefa7 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.20"). %% Enterprise edition --define(EMQX_RELEASE_EE, "5.0.1"). +-define(EMQX_RELEASE_EE, "5.0.2-alpha.1"). %% the HTTP API version -define(EMQX_API_VERSION, "5.0"). diff --git a/deploy/charts/emqx-enterprise/Chart.yaml b/deploy/charts/emqx-enterprise/Chart.yaml index 8474a00b0..4b5382090 100644 --- a/deploy/charts/emqx-enterprise/Chart.yaml +++ b/deploy/charts/emqx-enterprise/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 5.0.1 +version: 5.0.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 5.0.1 +appVersion: 5.0.2 From d337814c089c32ee4469d40717b973b5ecb26382 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Tue, 14 Mar 2023 16:37:50 +0100 Subject: [PATCH 5/5] ci: tmp fix for build packages - do not build raspbian9 and raspbian10 packages - install krb5-devel in el9 (to be fixed in builder) --- .github/workflows/build_packages.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 73a2ece7a..f98e4a6dc 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -213,8 +213,6 @@ jobs: - ubuntu18.04 - debian11 - debian10 - - raspbian10 - - raspbian9 - el9 - el8 - el7 @@ -231,10 +229,6 @@ jobs: build_machine: ubuntu-22.04 - arch: amd64 build_machine: aws-arm64 - - arch: amd64 - os: raspbian9 - - arch: amd64 - os: raspbian10 include: - profile: emqx otp: 25.1.2-2 @@ -266,6 +260,11 @@ jobs: path: . - name: unzip source code run: unzip -q source.zip + - name: tmp fix for el9 + if: matrix.os == 'el9' + run: | + set -eu + dnf install -y krb5-devel - name: build emqx packages working-directory: source env: @@ -378,8 +377,6 @@ jobs: push "debian/buster" "packages/$PROFILE/$PROFILE-$VERSION-debian10-arm64.deb" push "debian/bullseye" "packages/$PROFILE/$PROFILE-$VERSION-debian11-amd64.deb" push "debian/bullseye" "packages/$PROFILE/$PROFILE-$VERSION-debian11-arm64.deb" - push "raspbian/stretch" "packages/$PROFILE/$PROFILE-$VERSION-raspbian9-arm64.deb" - push "raspbian/buster" "packages/$PROFILE/$PROFILE-$VERSION-raspbian10-arm64.deb" push "ubuntu/bionic" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu18.04-amd64.deb" push "ubuntu/bionic" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu18.04-arm64.deb" push "ubuntu/focal" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu20.04-amd64.deb"