From abee0229b9980f5f093b4a424632189d28c2e7af Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Fri, 15 Nov 2013 00:03:27 +0200 Subject: [PATCH] [PATCH 5/5] compact: improve error messages on failures after compaction --- 31/84d150acd0370dff125b5375a96625494f7166 | 91 +++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 31/84d150acd0370dff125b5375a96625494f7166 diff --git a/31/84d150acd0370dff125b5375a96625494f7166 b/31/84d150acd0370dff125b5375a96625494f7166 new file mode 100644 index 000000000..dd8b096a1 --- /dev/null +++ b/31/84d150acd0370dff125b5375a96625494f7166 @@ -0,0 +1,91 @@ +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 6F5CB431E84 + for ; Thu, 14 Nov 2013 14:03:43 -0800 (PST) +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 QYdAtEpnszOv for ; + Thu, 14 Nov 2013 14:03:36 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id ABF09431E62 + for ; Thu, 14 Nov 2013 14:03:36 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 422CD1000E5; Fri, 15 Nov 2013 00:03:32 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 5/5] compact: improve error messages on failures after + compaction +Date: Fri, 15 Nov 2013 00:03:27 +0200 +Message-Id: <1384466607-28298-3-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1384466607-28298-1-git-send-email-tomi.ollila@iki.fi> +References: + <1384466607-28298-1-git-send-email-tomi.ollila@iki.fi> +Cc: tomi.ollila@iki.fi +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: Thu, 14 Nov 2013 22:03:43 -0000 + +The error messages written during the steps replacing old +database with new now includes relevant paths and strerror. +--- + lib/database.cc | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/lib/database.cc b/lib/database.cc +index d09ad99..f395061 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -942,19 +942,27 @@ 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 %s to %s: %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 %s to %s: %s\n", ++ compact_xapian_path, xapian_path, strerror (errno)); + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; + } + +- if (! keep_backup) +- rmtree (backup_path); ++ if (! keep_backup) { ++ if (rmtree (backup_path)) { ++ fprintf (stderr, "Error removing old database %s: %s\n", ++ backup_path, strerror (errno)); ++ ret = NOTMUCH_STATUS_FILE_ERROR; ++ goto DONE; ++ } ++ } + + DONE: + if (notmuch) +-- +1.8.0 + -- 2.26.2