From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 7/9] v2writable: cleanup SQLite handles on --xapian-only Date: Wed, 24 Mar 2021 14:23:33 +0500 [thread overview] Message-ID: <20210324092335.12345-8-e@80x24.org> (raw) In-Reply-To: <20210324092335.12345-1-e@80x24.org> I'm not sure exactly why this is needed with run_script localizing %SIG and everything else, but explictly cleaning up seems to fix the occasional test failures I see. Followup-to: 4c6c853494b49368 ("tests: show lsof output on deleted-file-check failures") --- lib/PublicInbox/V2Writable.pm | 1 + t/v2reindex.t | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 03590850..4130a472 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1323,6 +1323,7 @@ sub xapian_only { } } $self->git->cat_async_wait; + $self->{ibx}->cleanup; $self->done; } diff --git a/t/v2reindex.t b/t/v2reindex.t index 1145e31b..e9f2b73b 100644 --- a/t/v2reindex.t +++ b/t/v2reindex.t @@ -549,5 +549,13 @@ my $env = { PI_CONFIG => '/dev/null' }; ok(run_script([qw(-index --reindex --xapian-only), $inboxdir], $env, $rdr), '--xapian-only works'); is($err, '', 'no errors from --xapian-only'); - +undef $for_destroy; +SKIP: { + use PublicInbox::Spawn qw(which); + skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux'; + my $lsof = which('lsof') or skip 'no lsof in PATH', 1; + my $rdr = { 2 => \(my $null_err) }; + my @d = grep(m!/xap[0-9]+/!, xqx([$lsof, '-p', $$], undef, $rdr)); + is_deeply(\@d, [], 'no deleted index files') or diag explain(\@d); +} done_testing();
next prev parent reply other threads:[~2021-03-24 9:23 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-24 9:23 [PATCH 0/9] lei: various corner case leak fixes Eric Wong 2021-03-24 9:23 ` [PATCH 1/9] ds: improve DS->Reset fork-safety Eric Wong 2021-03-24 23:01 ` [SQUASH] " Eric Wong 2021-03-24 9:23 ` [PATCH 2/9] mbox_lock: dotlock: chdir for relative lock paths Eric Wong 2021-03-24 9:23 ` [PATCH 3/9] lei: drop circular reference in lei_store process Eric Wong 2021-03-24 9:23 ` [PATCH 4/9] lei: update {3} after -C chdirs Eric Wong 2021-03-24 9:23 ` [PATCH 5/9] lei: clean up pkt_op consumer on exception, too Eric Wong 2021-03-24 9:23 ` [PATCH 6/9] lei_store: give process a better name Eric Wong 2021-03-24 9:23 ` Eric Wong [this message] 2021-03-24 9:23 ` [PATCH 8/9] lei_mirror: fix circular reference Eric Wong 2021-03-24 9:23 ` [PATCH 9/9] lei-daemon: do not leak FDs on bogus requests Eric Wong
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: https://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=20210324092335.12345-8-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 7/9] v2writable: cleanup SQLite handles on --xapian-only' \ /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
Code repositories for project(s) associated with this 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).