You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2025/09/08 14:12:19 UTC
(couchdb) branch auto-delete-tseq updated (31c5a27d9 -> f3b301a69)
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a change to branch auto-delete-tseq
in repository https://gitbox.apache.org/repos/asf/couchdb.git
discard 31c5a27d9 purge tombstones that exceed TTL
new 9d311608b configure ELP (https://whatsapp.github.io/erlang-language-platform)
new f3b301a69 purge tombstones that exceed TTL
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (31c5a27d9)
\
N -- N -- N refs/heads/auto-delete-tseq (f3b301a69)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.elp.toml | 3 +++
src/couch/src/couch_tombstone_remover.erl | 27 ++++++++++++++++++---------
2 files changed, 21 insertions(+), 9 deletions(-)
create mode 100644 .elp.toml
(couchdb) 02/02: purge tombstones that exceed TTL
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch auto-delete-tseq
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit f3b301a692430d1ee53b1680d8e10594ba85b44e
Author: Robert Newson <rn...@apache.org>
AuthorDate: Tue Sep 2 15:32:21 2025 +0100
purge tombstones that exceed TTL
---
src/couch/src/couch_tombstone_remover.erl | 137 ++++++++++++++++++++++++++++++
1 file changed, 137 insertions(+)
diff --git a/src/couch/src/couch_tombstone_remover.erl b/src/couch/src/couch_tombstone_remover.erl
new file mode 100644
index 000000000..03922ddc7
--- /dev/null
+++ b/src/couch/src/couch_tombstone_remover.erl
@@ -0,0 +1,137 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(couch_tombstone_remover).
+-behaviour(couch_scanner_plugin).
+
+-export([
+ start/2,
+ resume/2,
+ complete/1,
+ checkpoint/1,
+ db/2,
+ db_opened/2,
+ db_closing/2,
+ doc_fdi/3
+]).
+
+-include_lib("couch_scanner/include/couch_scanner_plugin.hrl").
+
+start(ScanId, #{}) ->
+ St = init_config(ScanId),
+ case should_run() of
+ true ->
+ ?INFO("Starting.", [], St),
+ {ok, St};
+ false ->
+ ?INFO("Not starting.", [], St),
+ skip
+ end.
+
+resume(ScanId, #{}) ->
+ St = init_config(ScanId),
+ case should_run() of
+ true ->
+ ?INFO("Resuming.", [], St),
+ {ok, St};
+ false ->
+ ?INFO("Not resuming.", [], St),
+ skip
+ end.
+
+complete(St) ->
+ ?INFO("Completed", [], St),
+ {ok, #{}}.
+
+checkpoint(_St) ->
+ {ok, #{}}.
+
+db(St, DbName) ->
+ case config:get_integer("tombstone_remover_ttl", ?b2l(DbName), 0) of
+ 0 ->
+ {skip, St};
+ TTL when is_integer(TTL), TTL > 0 ->
+ {ok, St#{ttl => TTL}}
+ end.
+
+db_opened(#{} = St, Db) ->
+ #{ttl := TTL} = St,
+ EndSeq = couch_time_seq:since(couch_db:get_time_seq(Db), couch_time_seq:timestamp() - TTL),
+ ChangeOpts =
+ if
+ EndSeq == now -> [];
+ true -> [{end_key, EndSeq}]
+ end,
+ ?INFO("scanning for tombstones in ~s up to ~p", [couch_db:name(Db), EndSeq], meta(St)),
+ {0, ChangeOpts, St#{count => 0, end_seq => EndSeq}}.
+
+db_closing(#{} = St, Db) ->
+ #{count := Count} = St,
+ ?INFO("purged ~B tombstones from ~s", [Count, couch_db:name(Db)], meta(St)),
+ {ok, St}.
+
+doc_fdi(#{} = St, #full_doc_info{deleted = true} = FDI, Db) ->
+ #{end_seq := EndSeq} = St,
+ if
+ FDI#full_doc_info.update_seq =< EndSeq ->
+ {ok, purge(St, FDI, Db)};
+ true ->
+ {ok, St}
+ end;
+doc_fdi(#{} = St, #full_doc_info{}, _Db) ->
+ {ok, St}.
+
+purge(#{} = St, #full_doc_info{} = FDI, Db) ->
+ {Id, Revs} = fdi_to_idrevs(FDI),
+ MaxBatchSize = config:get_integer("couch_tombstone_remover", "max_batch_size", 100),
+ purge(St, Id, Revs, MaxBatchSize, Db).
+
+purge(#{} = St, Id, Revs, MaxBatchSize, Db) when length(Revs) =< MaxBatchSize ->
+ DbName = mem3:dbname(couch_db:name(Db)),
+ {Pid, Ref} = spawn_monitor(fun() ->
+ exit(fabric:purge_docs(DbName, [{Id, Revs}], [?ADMIN_CTX]))
+ end),
+ receive
+ {'DOWN', Ref, process, Pid, {ok, Results}} ->
+ #{count := Count} = St,
+ St#{count => Count + length(Results)};
+ {'DOWN', Ref, process, Pid, {accepted, Results}} ->
+ #{count := Count} = St,
+ St#{count => Count + length(Results)};
+ {'DOWN', Ref, process, Pid, Else} ->
+ ?WARN(
+ "Failed to purge tombstones in ~s/~s for reason ~p",
+ [DbName, Id, Else],
+ meta(St)
+ ),
+ St
+ end;
+purge(#{} = St0, Id, Revs, MaxBatchSize, Db) ->
+ {RevBatch, RevRest} = lists:split(MaxBatchSize, Revs),
+ St1 = purge(St0, Id, RevBatch, MaxBatchSize, Db),
+ purge(St1, Id, RevRest, MaxBatchSize, Db).
+
+fdi_to_idrevs(#full_doc_info{} = FDI) ->
+ Revs = [
+ couch_doc:rev_to_str({Pos, RevId})
+ || {#leaf{}, {Pos, [RevId | _]}} <- couch_key_tree:get_all_leafs(FDI#full_doc_info.rev_tree)
+ ],
+ {FDI#full_doc_info.id, Revs}.
+
+init_config(ScanId) ->
+ #{sid => ScanId}.
+
+should_run() ->
+ true.
+
+meta(#{sid := ScanId}) ->
+ #{sid => ScanId}.
(couchdb) 01/02: configure ELP (https://whatsapp.github.io/erlang-language-platform)
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch auto-delete-tseq
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 9d311608bea037222aee5c0e01312e9737c82459
Author: Robert Newson <rn...@apache.org>
AuthorDate: Mon Sep 8 14:37:24 2025 +0100
configure ELP (https://whatsapp.github.io/erlang-language-platform)
---
.elp.toml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.elp.toml b/.elp.toml
new file mode 100644
index 000000000..822c8808f
--- /dev/null
+++ b/.elp.toml
@@ -0,0 +1,3 @@
+[build_info]
+apps = ["src/*"]
+include_dirs = ["src", "src/*/include"]