From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH 3/3] lib: provide user more information on after-compaction failures
Date: Mon, 11 Nov 2013 19:55:38 +0200 [thread overview]
Message-ID: <1384192538-15291-4-git-send-email-tomi.ollila@iki.fi> (raw)
In-Reply-To: <1384192538-15291-1-git-send-email-tomi.ollila@iki.fi>
After database has been compacted, there are steps to put the new
database into place -- and these steps may fail. Provide better
information how to resolve these failure cases.
Thanks to Ben Gamari for most of the information content.
---
lib/database.cc | 38 ++++++++++++++++++++++++++++++++++----
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/lib/database.cc b/lib/database.cc
index 78693b7..40272dc 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -937,19 +937,49 @@ notmuch_database_compact (const char* path,
}
if (rename(xapian_path, backup_path)) {
- fprintf (stderr, "Error moving old database out of the way\n");
+ fprintf (stderr, "Error moving old database out of the way:\n"
+ "Old database: %s\n"
+ "Backup database: %s\n"
+ "Error: %s\n", xapian_path, backup_path, strerror (errno));
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
if (rename(compact_xapian_path, xapian_path)) {
- fprintf (stderr, "Error moving compacted database\n");
+ fprintf (stderr, "Error moving compacted database into place: %s\n", strerror (errno));
+ fprintf (stderr, "\n"
+ "Encountered error while moving the compacted database\n"
+ "\n"
+ " %s\n"
+ "\n"
+ "to\n"
+ "\n"
+ " %s\n"
+ "\n"
+ "Please identify the reason for this and move the compacted database\n"
+ "into place manually.\n"
+ "\n"
+ "Alternatively you can revert to the uncompacted database with\n"
+ "\n"
+ " mv '%s' '%s'\n"
+ "\n", compact_xapian_path, xapian_path,
+ backup_path, xapian_path);
ret = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
- if (! keep_backup)
- rmtree (backup_path);
+ if (! keep_backup) {
+ if (rmtree (backup_path)) {
+ fprintf (stderr, "Error removing backup database: %s\n",
+ strerror (errno));
+ fprintf (stderr, "\n"
+ "Please remove the backup database with\n"
+ "\n"
+ " rm -rf '%s'\n" "\n", backup_path);
+ ret = NOTMUCH_STATUS_FILE_ERROR;
+ goto DONE;
+ }
+ }
DONE:
if (notmuch)
--
1.8.3.1
next prev parent reply other threads:[~2013-11-11 17:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-11 17:55 compactor adjustments Tomi Ollila
2013-11-11 17:55 ` [PATCH 1/3] lib: make compact to keep backup until new database in place Tomi Ollila
2013-11-11 17:55 ` [PATCH 2/3] lib: unconditionally attempt to remove old wip database compact directory Tomi Ollila
2013-11-11 17:55 ` Tomi Ollila [this message]
2013-11-12 18:58 ` compactor adjustments Tomi Ollila
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=1384192538-15291-4-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).