From 5b5f33c421c75a5765e5348b7543a88a2e27413e Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Mon, 24 Jun 2024 12:49:59 +0200 Subject: [PATCH] chore(dsstore): resurrect `prepare_batch` entry tracepoint --- .../src/emqx_ds_storage_layer.erl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/emqx_durable_storage/src/emqx_ds_storage_layer.erl b/apps/emqx_durable_storage/src/emqx_ds_storage_layer.erl index 6d1744a07..1ff63aa51 100644 --- a/apps/emqx_durable_storage/src/emqx_ds_storage_layer.erl +++ b/apps/emqx_durable_storage/src/emqx_ds_storage_layer.erl @@ -317,9 +317,6 @@ drop_shard(Shard) -> ) -> emqx_ds:store_batch_result(). store_batch(Shard, Messages, Options) -> - ?tp(emqx_ds_storage_layer_store_batch, #{ - shard => Shard, messages => Messages, options => Options - }), case prepare_batch(Shard, Messages, #{}) of {ok, CookedBatch} -> commit_batch(Shard, CookedBatch, Options); @@ -334,9 +331,12 @@ store_batch(Shard, Messages, Options) -> [{emqx_ds:time(), emqx_types:message()}], batch_prepare_opts() ) -> {ok, cooked_batch()} | ignore | emqx_ds:error(_). -prepare_batch(Shard, Messages = [{Time, _} | _], _Options) -> +prepare_batch(Shard, Messages = [{Time, _} | _], Options) -> %% NOTE %% We assume that batches do not span generations. Callers should enforce this. + ?tp(emqx_ds_storage_layer_prepare_batch, #{ + shard => Shard, messages => Messages, options => Options + }), %% FIXME: always store messages in the current generation case generation_at(Shard, Time) of {GenId, #{module := Mod, data := GenData}} -> @@ -344,9 +344,6 @@ prepare_batch(Shard, Messages = [{Time, _} | _], _Options) -> Result = case Mod:prepare_batch(Shard, GenData, Messages) of {ok, CookedBatch} -> - ?tp(emqx_ds_storage_layer_batch_cooked, #{ - shard => Shard, gen => GenId, batch => CookedBatch - }), {ok, #{?tag => ?COOKED_BATCH, ?generation => GenId, ?enc => CookedBatch}}; Error = {error, _, _} -> Error