user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 7/7] compact: better handling of over.sqlite3* files
Date: Thu,  5 Apr 2018 09:34:12 +0000	[thread overview]
Message-ID: <20180405093412.22348-8-e@80x24.org> (raw)
In-Reply-To: <20180405093412.22348-1-e@80x24.org>

Lets not scare users when they encounter files that are supposed
to be there.  Then, preserve the journal and pipe.lock, even if
they're supposedly unused due to us holding the inbox-wide lock.
---
 script/public-inbox-compact | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index e697716..b8aaa4b 100755
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -35,8 +35,16 @@ $ibx->umask_prepare;
 sub commit_changes ($$$) {
 	my ($im, $old, $new) = @_;
 	my @st = stat($old) or die "failed to stat($old): $!\n";
+
+	for my $suf (qw(.pipe.lock -journal)) {
+		my $orig = "$old/over.sqlite3$suf";
+		link($orig, "$new/over.sqlite3$suf") and next;
+		next if $!{ENOENT};
+		die "failed to link $orig => $new/over.sqlite3$suf: $!\n";
+	}
 	link("$old/over.sqlite3", "$new/over.sqlite3") or die
 		"failed to link {$old => $new}/over.sqlite3: $!\n";
+
 	rename($old, "$new/old") or die "rename $old => $new/old: $!\n";
 	chmod($st[2] & 07777, $new) or die "chmod $old: $!\n";
 	rename($new, $old) or die "rename $new => $old: $!\n";
@@ -58,6 +66,7 @@ if ($v == 2) {
 			if ($dn =~ /\A\d+\z/) {
 				push @parts, "$old/$dn";
 			} elsif ($dn eq '.' || $dn eq '..') {
+			} elsif ($dn =~ /\Aover\.sqlite3/) {
 			} else {
 				warn "W: skipping unknown Xapian DB: $old/$dn\n"
 			}
-- 
EW


      parent reply	other threads:[~2018-04-05  9:34 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-05  9:34 [PATCH 0/7] v2 odds and ends Eric Wong (Contractor, The Linux Foundation)
2018-04-05  9:34 ` [PATCH 1/7] v2writable: recount partitions after acquiring lock Eric Wong (Contractor, The Linux Foundation)
2018-04-05  9:34 ` [PATCH 2/7] searchmsg: remove unused `tid' and `path' methods Eric Wong (Contractor, The Linux Foundation)
2018-04-05  9:34 ` [PATCH 3/7] search: remove unnecessary OP_AND of query Eric Wong (Contractor, The Linux Foundation)
2018-04-05  9:34 ` [PATCH 4/7] mbox: do not sort search results Eric Wong (Contractor, The Linux Foundation)
2018-04-05  9:34 ` [PATCH 5/7] searchview: minor cleanup Eric Wong (Contractor, The Linux Foundation)
2018-04-05  9:34 ` [PATCH 6/7] support altid mechanism for v2 Eric Wong (Contractor, The Linux Foundation)
2018-04-05  9:34 ` Eric Wong (Contractor, The Linux Foundation) [this message]

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=20180405093412.22348-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).