From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH v2 4/5] compact: unconditionally attempt to remove old wip database compact directory
Date: Wed, 13 Nov 2013 19:02:46 +0200 [thread overview]
Message-ID: <1384362167-12740-5-git-send-email-tomi.ollila@iki.fi> (raw)
In-Reply-To: <1384362167-12740-1-git-send-email-tomi.ollila@iki.fi>
In case previous notmuch compact has been interrupted there is old
work-in-progress database compact directory partially filled. Remove
it just before starting to fill the directory with new files.
---
lib/database.cc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/lib/database.cc b/lib/database.cc
index ee09c5e..4b5ac64 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -920,6 +920,11 @@ notmuch_database_compact (const char *path,
goto DONE;
}
+ // Unconditionally attempt to remove old work-in-progress database (if any).
+ // This is "protected" by database lock. If this fails due to write errors
+ // (etc), the following code will fail and provide error message.
+ (void) rmtree (compact_xapian_path);
+
try {
NotmuchCompactor compactor (status_cb, closure);
--
1.8.3.1
next prev parent reply other threads:[~2013-11-13 17:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-13 17:02 compactor adjustments v2 Tomi Ollila
2013-11-13 17:02 ` [PATCH v2 1/5] compact: tidy formatting Tomi Ollila
2013-11-13 17:02 ` [PATCH v2 2/5] compact: catch Xapian::Error consistently Tomi Ollila
2013-11-14 14:13 ` Jani Nikula
2013-11-18 0:33 ` David Bremner
2013-11-13 17:02 ` [PATCH v2 3/5] compact: preserve backup database until compacted database is in place Tomi Ollila
2013-11-14 14:08 ` Jani Nikula
2013-11-13 17:02 ` Tomi Ollila [this message]
2013-11-14 14:02 ` [PATCH v2 4/5] compact: unconditionally attempt to remove old wip database compact directory Jani Nikula
2013-11-13 17:02 ` [PATCH v2 5/5] compact: provide user more information on after-compaction failures Tomi Ollila
2013-11-14 14:13 ` Jani Nikula
2013-11-14 16:11 ` David Bremner
2013-11-14 17:23 ` Tomi Ollila
2013-11-17 11:34 ` David Bremner
2013-11-17 15:28 ` Tomi Ollila
2013-11-18 0:53 ` David Bremner
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://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384362167-12740-5-git-send-email-tomi.ollila@iki.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.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://yhetil.org/notmuch.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).