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

Merge pull request #7079 from rabbitmq/gh-7068 

Fix direct_exchange_routing_v2 migration
This commit is contained in:
Michael Klishin 2023-01-30 06:37:24 -05:00 committed by GitHub
parent 5dc2d9b828 590fa68fdc
commit 251be71ebe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deps/rabbit/src/rabbit_core_ff.erl vendored
View File

@ -133,19 +133,22 @@
Args :: rabbit_feature_flags:enable_callback_args(), Args :: rabbit_feature_flags:enable_callback_args(),
Ret :: rabbit_feature_flags:enable_callback_ret(). Ret :: rabbit_feature_flags:enable_callback_ret().
direct_exchange_routing_v2_enable(#{feature_name := FeatureName}) -> direct_exchange_routing_v2_enable(#{feature_name := FeatureName}) ->
TableName = rabbit_index_route, DependantTables = [rabbit_route, rabbit_exchange],
ok = rabbit_table:wait([rabbit_route, rabbit_exchange], _Retry = true), ok = rabbit_table:wait(DependantTables, _Retry = true),
[ok = rabbit_table:create_local_copy(Tab, ram_copies) || Tab <- DependantTables],
NewTable = rabbit_index_route,
try try
ok = rabbit_table:create( ok = rabbit_table:create(
TableName, rabbit_table:rabbit_index_route_definition()), NewTable, rabbit_table:rabbit_index_route_definition()),
case rabbit_table:ensure_table_copy(TableName, node(), ram_copies) of case rabbit_table:ensure_table_copy(NewTable, node(), ram_copies) of
ok -> ok ->
ok = rabbit_binding:populate_index_route_table(); ok = rabbit_binding:populate_index_route_table();
{error, Err} = Error -> {error, Err} = Error ->
?LOG_ERROR( ?LOG_ERROR(
"Feature flags: `~ts`: failed to add copy of table ~ts to " "Feature flags: `~ts`: failed to add copy of table ~ts to "
"node ~tp: ~tp", "node ~tp: ~tp",
[FeatureName, TableName, node(), Err], [FeatureName, NewTable, node(), Err],
#{domain => ?RMQLOG_DOMAIN_FEAT_FLAGS}), #{domain => ?RMQLOG_DOMAIN_FEAT_FLAGS}),
Error Error
end end

5
deps/rabbit/src/rabbit_table.erl vendored
View File

@ -9,7 +9,7 @@
-export([ -export([
create/0, create/2, ensure_local_copies/1, ensure_table_copy/3, create/0, create/2, ensure_local_copies/1, ensure_table_copy/3,
wait_for_replicated/1, wait/1, wait/2, create_local_copy/2, wait_for_replicated/1, wait/1, wait/2,
force_load/0, is_present/0, is_empty/0, needs_default_data/0, force_load/0, is_present/0, is_empty/0, needs_default_data/0,
check_schema_integrity/1, clear_ram_only_tables/0, retry_timeout/0, check_schema_integrity/1, clear_ram_only_tables/0, retry_timeout/0,
wait_for_replicated/0, exists/1]). wait_for_replicated/0, exists/1]).
@ -74,7 +74,7 @@ ensure_secondary_index(Table, Field) ->
{aborted, {already_exists, Table, _}} -> ok {aborted, {already_exists, Table, _}} -> ok
end. end.
-spec ensure_table_copy(atom(), node(), ram_copies | disc_copies) -> -spec ensure_table_copy(mnesia:table(), node(), mnesia:storage_type()) ->
ok | {error, any()}. ok | {error, any()}.
ensure_table_copy(TableName, Node, StorageType) -> ensure_table_copy(TableName, Node, StorageType) ->
rabbit_log:debug("Will add a local schema database copy for table '~ts'", [TableName]), rabbit_log:debug("Will add a local schema database copy for table '~ts'", [TableName]),
@ -239,6 +239,7 @@ create_local_copies(Type) ->
end, definitions(Type)), end, definitions(Type)),
ok. ok.
-spec create_local_copy(mnesia:table(), mnesia:storage_type()) -> ok.
create_local_copy(Tab, Type) -> create_local_copy(Tab, Type) ->
StorageType = mnesia:table_info(Tab, storage_type), StorageType = mnesia:table_info(Tab, storage_type),
{atomic, ok} = {atomic, ok} =