summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2022-01-16 15:58:55 +0000
committerRobert Newson <rnewson@apache.org>2022-01-19 09:26:30 +0000
commitcb904de5dfb6232744ec49325343550c0775352a (patch)
treed9f90b05c201dba1a26ed606ebce8ecfb627a946
parent7954acafa0ab8bc1b8738e66471ea999bcb89ccd (diff)
downloadcouchdb-nonzero_instance_start_time.tar.gz
Non-zero instance_start_timenonzero_instance_start_time
Set instance_start_time to the creation time of the database to restore the ability for the replicator to detect a db recreation event during a replication. Without this, a replication can fail to notice the db was deleted and recreated, write the checkpoint document for the in-progress replication and keep going, whereas what should happen is the replication should reset from sequence 0.
-rw-r--r--src/chttpd/src/chttpd_db.erl3
-rw-r--r--src/fabric/src/fabric_db_info.erl5
-rw-r--r--src/mem3/src/mem3.erl11
3 files changed, 16 insertions, 3 deletions
diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl
index 875df6e00..cfae8ad5f 100644
--- a/src/chttpd/src/chttpd_db.erl
+++ b/src/chttpd/src/chttpd_db.erl
@@ -554,12 +554,13 @@ db_req(
%% for missing databases that'd return error 404 from chttpd
%% get_security used to prefer shards on the same node over other nodes
fabric:get_security(DbName, [{user_ctx, Ctx}]),
+ CreationTime = mem3:shard_creation_time(DbName),
send_json(
Req,
201,
{[
{ok, true},
- {instance_start_time, <<"0">>}
+ {instance_start_time, CreationTime}
]}
);
db_req(#httpd{path_parts = [_, <<"_ensure_full_commit">>]} = Req, _Db) ->
diff --git a/src/fabric/src/fabric_db_info.erl b/src/fabric/src/fabric_db_info.erl
index 2366420c8..5461404c5 100644
--- a/src/fabric/src/fabric_db_info.erl
+++ b/src/fabric/src/fabric_db_info.erl
@@ -19,6 +19,7 @@
go(DbName) ->
Shards = mem3:shards(DbName),
+ CreationTime = mem3:shard_creation_time(DbName),
Workers = fabric_util:submit_jobs(Shards, get_db_info, []),
RexiMon = fabric_util:create_monitors(Shards),
Fun = fun handle_message/3,
@@ -28,7 +29,7 @@ go(DbName) ->
try
case fabric_util:recv(Workers, #shard.ref, Fun, Acc0) of
{ok, Acc} ->
- {ok, Acc};
+ {ok, [{instance_start_time, CreationTime} | Acc]};
{timeout, {WorkersDict, _, _}} ->
DefunctWorkers = fabric_util:remove_done_workers(
WorkersDict,
@@ -117,7 +118,7 @@ merge_results(Info) ->
(_K, _V, Acc) ->
Acc
end,
- [{instance_start_time, <<"0">>}],
+ [],
Dict
).
diff --git a/src/mem3/src/mem3.erl b/src/mem3/src/mem3.erl
index 7151a3ec1..63778dc6f 100644
--- a/src/mem3/src/mem3.erl
+++ b/src/mem3/src/mem3.erl
@@ -33,6 +33,7 @@
-export([get_placement/1]).
-export([ping/1, ping/2]).
-export([db_is_current/1]).
+-export([shard_creation_time/1]).
%% For mem3 use only.
-export([name/1, node/1, range/1, engine/1]).
@@ -198,6 +199,16 @@ shard_suffix(DbName0) when is_binary(DbName0) ->
shard_suffix(Db) ->
shard_suffix(couch_db:name(Db)).
+shard_creation_time(DbName0) ->
+ Shard = hd(shards(DbName0)),
+ case Shard#shard.name of
+ <<"shards/", _:8/binary, "-", _:8/binary, "/", DbName/binary>> ->
+ [$. | Time] = filename:extension(binary_to_list(DbName)),
+ list_to_binary(Time);
+ _ ->
+ <<"0">>
+ end.
+
fold_shards(Fun, Acc) ->
mem3_shards:fold(Fun, Acc).