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 28a5924c5..ab64005b6 100644
--- a/apps/emqx_durable_storage/src/emqx_ds_storage_layer.erl
+++ b/apps/emqx_durable_storage/src/emqx_ds_storage_layer.erl
@@ -253,7 +253,7 @@ next(Shard, Iter = #{?tag := ?IT, ?generation := GenId, ?enc := GenIter0}, Batch
             Error
     end.
 
--spec update_config(shard_id(), emqx_ds:builtin_db_opts()) -> ok.
+-spec update_config(shard_id(), emqx_ds:create_db_opts()) -> ok.
 update_config(ShardId, Options) ->
     gen_server:call(?REF(ShardId), {?FUNCTION_NAME, Options}, infinity).
 
@@ -265,7 +265,7 @@ add_generation(ShardId) ->
 %% gen_server for the shard
 %%================================================================================
 
--spec start_link(shard_id(), emqx_ds:builtin_db_options()) ->
+-spec start_link(shard_id(), emqx_ds:create_db_opts()) ->
     {ok, pid()}.
 start_link(Shard = {_, _}, Options) ->
     gen_server:start_link(?REF(Shard), ?MODULE, {Shard, Options}, []).
diff --git a/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl b/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl
index 5322c0f17..f771f1a8b 100644
--- a/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl
+++ b/apps/emqx_durable_storage/src/proto/emqx_ds_proto_v2.erl
@@ -112,7 +112,7 @@ update_iterator(Node, DB, Shard, OldIter, DSKey) ->
     ]).
 
 -spec add_generation([node()], emqx_ds:db()) ->
-    [{ok, ok} | erpc:caught_call_exception()].
+    [{ok, ok} | {error, _}].
 add_generation(Node, DB) ->
     erpc:multicall(Node, emqx_ds_replication_layer, do_add_generation_v2, [DB]).