yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11100 from ieQu1/EMQX-10342 

fix(management): Don't wait for an empty shard
This commit is contained in:
Zaiming (Stone) Shi 2023-06-20 12:41:12 +02:00 committed by GitHub
parent 473cf4246b fe77a04581
commit d646086b41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_management/include/emqx_mgmt.hrl
View File

@ -14,6 +14,4 @@
%% limitations under the License. %% limitations under the License.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
-define(MANAGEMENT_SHARD, emqx_management_shard).
-define(DEFAULT_ROW_LIMIT, 100). -define(DEFAULT_ROW_LIMIT, 100).

1
apps/emqx_management/src/emqx_mgmt_app.erl
View File

@ -28,7 +28,6 @@
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").
start(_Type, _Args) -> start(_Type, _Args) ->
ok = mria_rlog:wait_for_shards([?MANAGEMENT_SHARD], infinity),
case emqx_mgmt_auth:init_bootstrap_file() of case emqx_mgmt_auth:init_bootstrap_file() of
ok -> ok ->
emqx_conf:add_handler([api_key], emqx_mgmt_auth), emqx_conf:add_handler([api_key], emqx_mgmt_auth),

2
changes/ce/fix-11092.en.md Normal file
View File

@ -0,0 +1,2 @@
Fix problem when replicants were unable to connect to the core node due to timeout in `mria_lb:core_nodes()` call.
Relevant mria pull request: https://github.com/emqx/mria/pull/143