From a07295d3bc3d4da81d77d5ba2f2e2c91e1cebb09 Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Fri, 5 Apr 2024 17:34:30 +0200 Subject: [PATCH] fix(ds): address shards in the supervisor properly --- apps/emqx_durable_storage/src/emqx_ds_builtin_db_sup.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx_durable_storage/src/emqx_ds_builtin_db_sup.erl b/apps/emqx_durable_storage/src/emqx_ds_builtin_db_sup.erl index c521164f4..195db7c34 100644 --- a/apps/emqx_durable_storage/src/emqx_ds_builtin_db_sup.erl +++ b/apps/emqx_durable_storage/src/emqx_ds_builtin_db_sup.erl @@ -74,7 +74,7 @@ start_egress({DB, Shard}) -> supervisor:start_child(?via(#?egress_sup{db = DB}), egress_spec(DB, Shard)). -spec stop_shard(emqx_ds_storage_layer:shard_id()) -> ok. -stop_shard(Shard = {DB, _}) -> +stop_shard({DB, Shard}) -> Sup = ?via(#?shards_sup{db = DB}), ok = supervisor:terminate_child(Sup, Shard), ok = supervisor:delete_child(Sup, Shard). @@ -212,7 +212,7 @@ sup_spec(Id, Options) -> shard_spec(DB, Shard) -> #{ - id => {shard, Shard}, + id => Shard, start => {?MODULE, start_link_sup, [#?shard_sup{db = DB, shard = Shard}, []]}, shutdown => infinity, restart => permanent,