[PATCH 2/3] lib: unconditionally attempt to remove old wip database compact directory

diff --git a/0f/1c8f1024f9b95429f85c73f578000cd10e13e0 b/0f/1c8f1024f9b95429f85c73f578000cd10e13e0
new file mode 100644 (file)
index 0000000..768aa3a
--- /dev/null
+++ b/0f/1c8f1024f9b95429f85c73f578000cd10e13e0
@@ -0,0 +1,71 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 56029429E4F\r
+       for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 09:56:02 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id LZUO+9-SOHtp for <notmuch@notmuchmail.org>;\r
+       Mon, 11 Nov 2013 09:55:56 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8D889429E43\r
+       for <notmuch@notmuchmail.org>; Mon, 11 Nov 2013 09:55:51 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 24F141000F2; Mon, 11 Nov 2013 19:55:45 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] lib: unconditionally attempt to remove old wip database\r
+       compact directory\r
+Date: Mon, 11 Nov 2013 19:55:37 +0200\r
+Message-Id: <1384192538-15291-3-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+In-Reply-To: <1384192538-15291-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1384192538-15291-1-git-send-email-tomi.ollila@iki.fi>\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 11 Nov 2013 17:56:02 -0000\r
+\r
+In case previous notmuch compact has been interrupted there is old\r
+work-in-progress database compact directory partially filled. Remove\r
+it just before starting to fill the directory with new files.\r
+---\r
+ lib/database.cc | 5 +++++\r
+ 1 file changed, 5 insertions(+)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 6b656e9..78693b7 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -918,6 +918,11 @@ notmuch_database_compact (const char* path,\r
+       goto DONE;\r
+     }\r
+ \r
++    // Unconditionally attempt to remove old work-in-progress database (if any).\r
++    // This is "protected" by database lock. If this fails due to write errors\r
++    // (etc), the following code will fail and provide error message.\r
++    (void) rmtree (compact_xapian_path);\r
++\r
+     try {\r
+       NotmuchCompactor compactor(status_cb, closure);\r
+ \r
+-- \r
+1.8.3.1\r
+\r