From: Jani Nikula <jani@nikula.org>
To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: Re: [PATCH v2 3/5] compact: preserve backup database until compacted database is in place
Date: Thu, 14 Nov 2013 15:08:55 +0100 [thread overview]
Message-ID: <874n7fnki0.fsf@nikula.org> (raw)
In-Reply-To: <1384362167-12740-4-git-send-email-tomi.ollila@iki.fi>
On Wed, 13 Nov 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> It is less error prone and window of failure opportunity is smaller
> if the old (backup) database is always renamed (instead of sometimes
> rmtree'd) before new (compacted) database is put into its place.
> Finally rmtree() old database in case old database backup is not kept.
> ---
> lib/database.cc | 42 +++++++++++++++++++++++++-----------------
> 1 file changed, 25 insertions(+), 17 deletions(-)
>
> diff --git a/lib/database.cc b/lib/database.cc
> index 3530cb6..ee09c5e 100644
> --- a/lib/database.cc
> +++ b/lib/database.cc
> @@ -873,6 +873,7 @@ notmuch_database_compact (const char *path,
> notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
> notmuch_database_t *notmuch = NULL;
> struct stat statbuf;
> + notmuch_bool_t keep_backup;
>
> local = talloc_new (NULL);
> if (! local)
> @@ -898,17 +899,25 @@ notmuch_database_compact (const char *path,
> goto DONE;
> }
>
> - if (backup_path != NULL) {
> - if (stat (backup_path, &statbuf) != -1) {
> - fprintf (stderr, "Backup path already exists: %s\n", backup_path);
> - ret = NOTMUCH_STATUS_FILE_ERROR;
> - goto DONE;
> - }
> - if (errno != ENOENT) {
> - fprintf (stderr, "Unknown error while stat()ing backup path: %s\n",
> - strerror (errno));
> + if (backup_path == NULL) {
> + if (! (backup_path = talloc_asprintf (local, "%s.old", xapian_path))) {
> + ret = NOTMUCH_STATUS_OUT_OF_MEMORY;
> goto DONE;
> }
> + keep_backup = FALSE;
> + }
> + else
> + keep_backup = TRUE;
*cough* I thought you were the style police around here *cough*
> +
> + if (stat (backup_path, &statbuf) != -1) {
> + fprintf (stderr, "Backup path already exists: %s\n", backup_path);
The user will be confused if he specifically didn't add --backup and
happens to get this. But maybe it's a corner case. *shrug*.
> + ret = NOTMUCH_STATUS_FILE_ERROR;
> + goto DONE;
> + }
> + if (errno != ENOENT) {
> + fprintf (stderr, "Unknown error while stat()ing backup path: %s\n",
> + strerror (errno));
ret = ?
> + goto DONE;
> }
>
> try {
> @@ -924,14 +933,10 @@ notmuch_database_compact (const char *path,
> goto DONE;
> }
>
> - if (backup_path) {
> - if (rename (xapian_path, backup_path)) {
> - fprintf (stderr, "Error moving old database out of the way\n");
> - ret = NOTMUCH_STATUS_FILE_ERROR;
> - goto DONE;
> - }
> - } else {
> - rmtree (xapian_path);
> + if (rename (xapian_path, backup_path)) {
> + fprintf (stderr, "Error moving old database out of the way\n");
> + ret = NOTMUCH_STATUS_FILE_ERROR;
> + goto DONE;
> }
>
> if (rename (compact_xapian_path, xapian_path)) {
> @@ -940,6 +945,9 @@ notmuch_database_compact (const char *path,
> goto DONE;
> }
>
> + if (! keep_backup)
> + rmtree (backup_path);
> +
> DONE:
> if (notmuch)
> notmuch_database_destroy (notmuch);
> --
> 1.8.3.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2013-11-14 14:38 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 [this message]
2013-11-13 17:02 ` [PATCH v2 4/5] compact: unconditionally attempt to remove old wip database compact directory Tomi Ollila
2013-11-14 14:02 ` 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=874n7fnki0.fsf@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/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).