root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
kjnilsson 2021-03-18 12:52:00 +00:00 committed by Michael Klishin
parent f6f02a5d2d
commit 75cea78415
No known key found for this signature in database
GPG Key ID: E80EDCFA0CDB21EE
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/rabbit/src/rabbit.erl vendored
View File

@ -284,6 +284,8 @@
%% 100 ms %% 100 ms
-define(BOOT_STATUS_CHECK_INTERVAL, 100). -define(BOOT_STATUS_CHECK_INTERVAL, 100).
-define(COORD_WAL_MAX_SIZE_B, 64_000_000).
%%---------------------------------------------------------------------------- %%----------------------------------------------------------------------------
-type restart_type() :: 'permanent' | 'transient' | 'temporary'. -type restart_type() :: 'permanent' | 'transient' | 'temporary'.
@ -375,6 +377,7 @@ run_prelaunch_second_phase() ->
Coord = Default#{name => coordination, Coord = Default#{name => coordination,
data_dir => CoordDataDir, data_dir => CoordDataDir,
wal_data_dir => CoordDataDir, wal_data_dir => CoordDataDir,
wal_max_size_bytes => ?COORD_WAL_MAX_SIZE_B,
names => ra_system:derive_names(coordination)}, names => ra_system:derive_names(coordination)},
{ok, _} = ra_system:start(Quorum), {ok, _} = ra_system:start(Quorum),

2
deps/rabbit/src/rabbit_stream_coordinator.erl vendored
View File

@ -116,7 +116,7 @@ start() ->
end. end.
recover() -> recover() ->
ra:restart_server({?MODULE, node()}). ra:restart_server(?RA_SYSTEM, {?MODULE, node()}).
%% new api %% new api

4
deps/rabbit/test/quorum_queue_SUITE.erl vendored
View File

@ -1617,8 +1617,8 @@ cleanup_data_dir(Config) ->
UId1 = proplists:get_value(ra_name(QQ), rpc:call(Server1, ra_directory, list_registered, [quorum])), UId1 = proplists:get_value(ra_name(QQ), rpc:call(Server1, ra_directory, list_registered, [quorum])),
UId2 = proplists:get_value(ra_name(QQ), rpc:call(Server2, ra_directory, list_registered, [quorum])), UId2 = proplists:get_value(ra_name(QQ), rpc:call(Server2, ra_directory, list_registered, [quorum])),
DataDir1 = rpc:call(Server1, ra_env, server_data_dir, [UId1]), DataDir1 = rpc:call(Server1, ra_env, server_data_dir, [quorum, UId1]),
DataDir2 = rpc:call(Server2, ra_env, server_data_dir, [UId2]), DataDir2 = rpc:call(Server2, ra_env, server_data_dir, [quorum, UId2]),
?assert(filelib:is_dir(DataDir1)), ?assert(filelib:is_dir(DataDir1)),
?assert(filelib:is_dir(DataDir2)), ?assert(filelib:is_dir(DataDir2)),