From: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
To: meta@public-inbox.org
Cc: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
Subject: [PATCH 07/14] v2writable: support purging messages from git entirely
Date: Thu, 29 Mar 2018 10:28:12 +0000 [thread overview]
Message-ID: <20180329102819.15234-8-e@80x24.org> (raw)
In-Reply-To: <20180329102819.15234-1-e@80x24.org>
Purging existing messages is fairly straightforward since we can
take advantage of Xapian and lookup the git object_id with it.
Unfortunately, purging an already "removed" message (which is
no longer in Xapian) is not as easy and we'll need to expose
->purge_oids to purge by the git object_id (currently SHA-1).
Furthermore, we expire reflogs and prune in hopes a dumb HTTP
client won't get the object.
---
lib/PublicInbox/Import.pm | 90 +++++++++++++++++++++++++++++++++++
lib/PublicInbox/V2Writable.pm | 39 +++++++++++++--
t/v2writable.t | 7 +++
3 files changed, 131 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index e07edda..f00c260 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -430,6 +430,96 @@ sub digest2mid ($) {
$b64 . '@localhost';
}
+sub clean_purge_buffer {
+ my ($oid, $buf) = @_;
+ my $cmt_msg = "purged $oid\n";
+
+ foreach my $i (0..$#$buf) {
+ my $l = $buf->[$i];
+ if ($l =~ /^author .* (\d+ [\+-]?\d+)$/) {
+ $buf->[$i] = "author <> $1\n";
+ } elsif ($l =~ /^data (\d+)/) {
+ $buf->[$i++] = "data " . length($cmt_msg) . "\n";
+ $buf->[$i] = $cmt_msg;
+ last;
+ }
+ }
+}
+
+sub purge_oids {
+ my ($self, $purge) = @_;
+ my $tmp = "refs/heads/purge-".((keys %$purge)[0]);
+ my $old = $self->{'ref'};
+ my $git = $self->{git};
+ my @export = (qw(fast-export --no-data --use-done-feature), $old);
+ my ($rd, $pid) = $git->popen(@export);
+ my ($r, $w) = $self->gfi_start;
+ my @buf;
+ my $npurge = 0;
+ while (<$rd>) {
+ if (/^reset (?:.+)/) {
+ push @buf, "reset $tmp\n";
+ } elsif (/^commit (?:.+)/) {
+ if (@buf) {
+ $w->print(@buf) or wfail;
+ @buf = ();
+ }
+ push @buf, "commit $tmp\n";
+ } elsif (/^data (\d+)/) {
+ # only commit message, so $len is small:
+ my $len = $1; # + 1 for trailing "\n"
+ push @buf, $_;
+ my $n = read($rd, my $buf, $len) or die "read: $!";
+ $len == $n or die "short read ($n < $len)";
+ push @buf, $buf;
+ } elsif (/^M 100644 ([a-f0-9]+) /) {
+ my $oid = $1;
+ if ($purge->{$oid}) {
+ my $lf = <$rd>;
+ if ($lf eq "\n") {
+ my $out = join('', @buf);
+ $out =~ s/^/# /sgm;
+ warn "purge rewriting\n", $out, "\n";
+ clean_purge_buffer($oid, \@buf);
+ $out = join('', @buf);
+ $w->print(@buf, "\n") or wfail;
+ @buf = ();
+ $npurge++;
+ } else {
+ die "expected LF: $lf\n";
+ }
+ } else {
+ push @buf, $_;
+ }
+ } else {
+ push @buf, $_;
+ }
+ }
+ if (@buf) {
+ $w->print(@buf) or wfail;
+ }
+ $w = $r = undef;
+ $self->done;
+ my @git = ('git', "--git-dir=$git->{git_dir}");
+
+ run_die([@git, qw(update-ref), $old, $tmp]) if $npurge;
+
+ run_die([@git, qw(update-ref -d), $tmp]);
+
+ return if $npurge == 0;
+
+ run_die([@git, qw(-c gc.reflogExpire=now gc --prune=all)]);
+ my $err = 0;
+ foreach my $oid (keys %$purge) {
+ my @info = $git->check($oid);
+ if (@info) {
+ warn "$oid not purged\n";
+ $err++;
+ }
+ }
+ die "Failed to purge $err object(s)\n" if $err;
+}
+
1;
__END__
=pod
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 9b280c6..ef9867d 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -209,11 +209,22 @@ sub idx_init {
$skel->_msgmap_init->{dbh}->begin_work;
}
-sub remove {
- my ($self, $mime, $cmt_msg) = @_;
+sub purge_oids {
+ my ($self, $purge) = @_; # $purge = { $object_id => 1, ... }
+ $self->done;
+ my $pfx = "$self->{-inbox}->{mainrepo}/git";
+ foreach my $i (0..$self->{max_git}) {
+ my $git = PublicInbox::Git->new("$pfx/$i.git");
+ my $im = $self->import_init($git, 0);
+ $im->purge_oids($purge);
+ }
+}
+
+sub remove_internal {
+ my ($self, $mime, $cmt_msg, $purge) = @_;
$self->barrier;
$self->idx_init;
- my $im = $self->importer;
+ my $im = $self->importer unless $purge;
my $ibx = $self->{-inbox};
my $srch = $ibx->search;
my $cid = content_id($mime);
@@ -245,11 +256,15 @@ sub remove {
# no bugs in our deduplication code:
$removed = $smsg;
$removed->{mime} = $cur;
- $im->remove(\$orig, $cmt_msg);
+ my $oid = $smsg->{blob};
+ if ($purge) {
+ $purge->{$oid} = 1;
+ } else {
+ $im->remove(\$orig, $cmt_msg);
+ }
$orig = undef;
$removed->num; # memoize this for callers
- my $oid = $smsg->{blob};
foreach my $idx (@$parts, $skel) {
$idx->remote_remove($oid, $mid);
}
@@ -258,9 +273,23 @@ sub remove {
});
$self->barrier;
}
+ if ($purge && scalar keys %$purge) {
+ purge_oids($self, $purge);
+ }
$removed;
}
+sub remove {
+ my ($self, $mime, $cmt_msg) = @_;
+ remove_internal($self, $mime, $cmt_msg);
+}
+
+sub purge {
+ my ($self, $mime) = @_;
+ remove_internal($self, $mime, undef, {});
+}
+
+
sub done {
my ($self) = @_;
my $locked = defined $self->{idx_parts};
diff --git a/t/v2writable.t b/t/v2writable.t
index c48f060..0eda432 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -231,4 +231,11 @@ EOF
ok(!$@, '->done is idempotent');
}
+{
+ ok($im->add($mime), 'add message to be purged');
+ local $SIG{__WARN__} = sub {};
+ ok($im->purge($mime), 'purged message');
+ $im->done;
+}
+
done_testing();
--
EW
next prev parent reply other threads:[~2018-03-29 10:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-29 10:28 [PATCH 00/14] purging support, v1 conversions, cleanups + more Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 01/14] www: remove unnecessary ghost checks Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 02/14] v2writable: append, instead of prepending generated Message-ID Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 03/14] lookup by Message-ID favors the "primary" one Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 04/14] www: fix attachment downloads for conflicted Message-IDs Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 05/14] searchmsg: document why we store To: and Cc: for NNTP Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 06/14] public-inbox-convert: tool for converting old to new inboxes Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` Eric Wong (Contractor, The Linux Foundation) [this message]
2018-03-29 10:28 ` [PATCH 08/14] search: cleanup uniqueness checking Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 09/14] search: get rid of most lookup_* subroutines Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 10/14] search: move find_doc_ids to searchidx Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 11/14] v2writable: cleanup: get rid of unused fields Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 12/14] mbox: avoid extracting Message-ID for linkification Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 13/14] www: cleanup expensive fallback for legacy URLs Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 14/14] view: get rid of some unnecessary imports Eric Wong (Contractor, The Linux Foundation)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180329102819.15234-8-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).