From 884f784c1c478e70ac32f5903cbccbcc136ad1ba Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Wed, 10 Jan 2024 19:20:26 +0100 Subject: [PATCH] refactor(router): don't `emqx_broker_helper:monitor/1` in batches As per out current understanding, this doesn't changes much in terms of observability, since other nodes call `ekka:monitor(membership)` anyway, so they will observe nodedowns without explicitly writing an entry into the `?ROUTING_NODE` table. --- apps/emqx/src/emqx_router.erl | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/apps/emqx/src/emqx_router.erl b/apps/emqx/src/emqx_router.erl index 3b191ac36..e7ab37ace 100644 --- a/apps/emqx/src/emqx_router.erl +++ b/apps/emqx/src/emqx_router.erl @@ -246,8 +246,6 @@ mria_delete_route(v1, Topic, Dest, Ctx) -> -spec do_batch(batch()) -> #{batch_route() => _Error}. do_batch(Batch) -> - Nodes = batch_get_dest_nodes(Batch), - ok = lists:foreach(fun emqx_router_helper:monitor/1, ordsets:to_list(Nodes)), mria_batch(get_schema_vsn(), Batch). mria_batch(v2, Batch) -> @@ -266,20 +264,6 @@ mria_batch_v1(Batch) -> Error end. -batch_get_dest_nodes(Batch) -> - maps:fold( - fun({_Topic, Dest}, Op, Acc) -> - case batch_get_action(Op) of - add -> - ordsets:add_element(get_dest_node(Dest), Acc); - delete -> - Acc - end - end, - ordsets:new(), - Batch - ). - batch_get_action(Op) -> element(1, Op).