From de86a22782bfa41ea1ed40181fecaaecdc6a972c Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 20 Oct 2013 21:13:16 +0300 Subject: [PATCH] Re: [PATCH 3/3] compact: Provide user with more error feedback --- 27/dcf604bd94d967d7df652665b1e15d899ba90c | 107 ++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 27/dcf604bd94d967d7df652665b1e15d899ba90c diff --git a/27/dcf604bd94d967d7df652665b1e15d899ba90c b/27/dcf604bd94d967d7df652665b1e15d899ba90c new file mode 100644 index 000000000..9827aedfc --- /dev/null +++ b/27/dcf604bd94d967d7df652665b1e15d899ba90c @@ -0,0 +1,107 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 39CB2431FC2 + for ; Sun, 20 Oct 2013 11:14:02 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id lt9+KOQZbWua for ; + Sun, 20 Oct 2013 11:13:25 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id D155D431FC0 + for ; Sun, 20 Oct 2013 11:13:24 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id EC09F10007D; + Sun, 20 Oct 2013 21:13:16 +0300 (EEST) +From: Tomi Ollila +To: Ben Gamari , notmuch@notmuchmail.org +Subject: Re: [PATCH 3/3] compact: Provide user with more error feedback +In-Reply-To: <1381799585-16274-4-git-send-email-bgamari.foss@gmail.com> +References: <1381799585-16274-1-git-send-email-bgamari.foss@gmail.com> + <1381799585-16274-4-git-send-email-bgamari.foss@gmail.com> +User-Agent: Notmuch/0.16+112~g46b74be (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 20 Oct 2013 18:14:02 -0000 + +On Tue, Oct 15 2013, Ben Gamari wrote: + +> Provide instructions on what to do when we couldn't move the compacted +> database into place. +> +> Signed-off-by: Ben Gamari +> --- +> lib/database.cc | 18 +++++++++++++++++- +> 1 file changed, 17 insertions(+), 1 deletion(-) +> +> diff --git a/lib/database.cc b/lib/database.cc +> index 57c2292..6f9fed1 100644 +> --- a/lib/database.cc +> +++ b/lib/database.cc +> @@ -938,7 +938,23 @@ notmuch_database_compact (const char* path, +> } +> +> 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"); +> + fprintf (stderr, "Encountered error %s while moving the compacted database,\n", +> + strerror(errno)); + +At this point 'errno' may have changed, so the above error string might not +be the same. Maybe removing the '%s ' part altogether as inserting the part +looks a bit strange... + +> + fprintf (stderr, "\n"); +> + fprintf (stderr, " %s\n", compact_xapian_path); +> + fprintf (stderr, "\n"); +> + fprintf (stderr, "to\n"); +> + fprintf (stderr, "\n"); +> + fprintf (stderr, " %s\n", xapian_path); +> + fprintf (stderr, "\n"); +> + fprintf (stderr, "Please identify the reason for this and move the compacted database into place manually.\n"); +> + if (backup_path != NULL) { +> + fprintf (stderr, "Otherwise, you can revert to the backup database located at,\n"); + +the commas (,) here and a few lines above looks a bit strange to me. + +> + fprintf (stderr, "\n"); +> + fprintf (stderr, " %s\n", backup_path); + +Maybe saying something how to do this revert would be enlightening to the +user... (i.e. mentioning that backup_path needs to be moved as xapian_path). + + +> + } + +> ret = NOTMUCH_STATUS_FILE_ERROR; +> goto DONE; +> } +> -- + +Tomi -- 2.26.2