diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-03-21 13:19:12 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-03-22 21:44:19 +0300 |
| commit | 8eac876bc8f0f74373a119490f0405413fc55cca (patch) | |
| tree | c8a10a1bc1af245826f608d4902633ac1bbc8a20 | |
| parent | 62677cbacf8caf53d245da40a8681ae1b251fb42 (diff) | |
| download | rabbitmq-server-git-ra-systems.tar.gz | |
Use "quorum_queues" for QQ Ra systemra-systems
"quorum" and "coordination" are not very distinctive
| -rw-r--r-- | deps/rabbit/src/rabbit.erl | 2 | ||||
| -rw-r--r-- | deps/rabbit/src/rabbit_quorum_queue.erl | 2 | ||||
| -rw-r--r-- | deps/rabbit/test/quorum_queue_SUITE.erl | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index b48afd7987..71c375034e 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -371,7 +371,7 @@ run_prelaunch_second_phase() -> ?LOG_DEBUG("Starting Ra Systems"), Default = ra_system:default_config(), - Quorum = Default#{name => quorum}, + Quorum = Default#{name => quorum_queues}, % names => ra_system:derive_names(quorum)}, CoordDataDir = filename:join([rabbit_mnesia:dir(), "coordination", node()]), Coord = Default#{name => coordination, diff --git a/deps/rabbit/src/rabbit_quorum_queue.erl b/deps/rabbit/src/rabbit_quorum_queue.erl index 6d35aa9a7c..ceaaa884b8 100644 --- a/deps/rabbit/src/rabbit_quorum_queue.erl +++ b/deps/rabbit/src/rabbit_quorum_queue.erl @@ -76,7 +76,7 @@ -type msg_id() :: non_neg_integer(). -type qmsg() :: {rabbit_types:r('queue'), pid(), msg_id(), boolean(), rabbit_types:message()}. --define(RA_SYSTEM, quorum). +-define(RA_SYSTEM, quorum_queues). -define(RA_WAL_NAME, ra_log_wal). -define(STATISTICS_KEYS, diff --git a/deps/rabbit/test/quorum_queue_SUITE.erl b/deps/rabbit/test/quorum_queue_SUITE.erl index 3ef9bddae0..27ae7ba2f6 100644 --- a/deps/rabbit/test/quorum_queue_SUITE.erl +++ b/deps/rabbit/test/quorum_queue_SUITE.erl @@ -531,11 +531,11 @@ vhost_with_quorum_queue_is_deleted(Config) -> ?assertEqual({'queue.declare_ok', QName, 0, 0}, declare(Ch, QName, [{<<"x-queue-type">>, longstr, <<"quorum">>}])), - UId = rpc:call(Node, ra_directory, where_is, [quorum, RaName]), + UId = rpc:call(Node, ra_directory, where_is, [quorum_queues, RaName]), ?assert(UId =/= undefined), ok = rabbit_ct_broker_helpers:delete_vhost(Config, VHost), %% validate quorum queues got deleted - undefined = rpc:call(Node, ra_directory, where_is, [quorum, RaName]), + undefined = rpc:call(Node, ra_directory, where_is, [quorum_queues, RaName]), ok. restart_all_types(Config) -> @@ -1615,10 +1615,10 @@ cleanup_data_dir(Config) -> declare(Ch, QQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}])), timer:sleep(100), - 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])), - DataDir1 = rpc:call(Server1, ra_env, server_data_dir, [quorum, UId1]), - DataDir2 = rpc:call(Server2, ra_env, server_data_dir, [quorum, UId2]), + UId1 = proplists:get_value(ra_name(QQ), rpc:call(Server1, ra_directory, list_registered, [quorum_queues])), + UId2 = proplists:get_value(ra_name(QQ), rpc:call(Server2, ra_directory, list_registered, [quorum_queues])), + DataDir1 = rpc:call(Server1, ra_env, server_data_dir, [quorum_queues, UId1]), + DataDir2 = rpc:call(Server2, ra_env, server_data_dir, [quorum_queues, UId2]), ?assert(filelib:is_dir(DataDir1)), ?assert(filelib:is_dir(DataDir2)), @@ -2083,7 +2083,7 @@ message_bytes_metrics(Config) -> memory_alarm_rolls_wal(Config) -> [Server | _] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename), - #{wal_data_dir := WalDataDir} = ra_system:fetch(quorum, Server), + #{wal_data_dir := WalDataDir} = ra_system:fetch(quorum_queues, Server), [Wal0] = filelib:wildcard(WalDataDir ++ "/*.wal"), rabbit_ct_broker_helpers:set_alarm(Config, Server, memory), rabbit_ct_helpers:await_condition( |