Re: [PATCH v2 4/5] compact: unconditionally attempt to remove old wip database compac...

diff --git a/af/949feb5b41c402e76fb3d4febc45f96e9fac27 b/af/949feb5b41c402e76fb3d4febc45f96e9fac27
new file mode 100644 (file)
index 0000000..292b48e
--- /dev/null
+++ b/af/949feb5b41c402e76fb3d4febc45f96e9fac27
@@ -0,0 +1,105 @@
+Return-Path: <jani@nikula.org>\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 10BD3431FC4\r
+       for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:09:56 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 oUcqTd625Y0W for <notmuch@notmuchmail.org>;\r
+       Thu, 14 Nov 2013 06:09:48 -0800 (PST)\r
+Received: from mail-bk0-f51.google.com (mail-bk0-f51.google.com\r
+       [209.85.214.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1E051431FB6\r
+       for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:09:47 -0800 (PST)\r
+Received: by mail-bk0-f51.google.com with SMTP id my10so407224bkb.24\r
+       for <notmuch@notmuchmail.org>; Thu, 14 Nov 2013 06:09:44 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=+9slkSVoKsNFbx2kg8ngGOHAODWk9nzr9Rls18y1Ee4=;\r
+       b=l24YmJkogebpriTGUK2RczN8ZBghGmto+cCqlU40d95jt/iMrzsHd8sqgmMExoQmrh\r
+       dG2uOuOceB/3upWu0VMOzmlV7rjdvruJYLTJWtUcn6NLfOv0+4q3XMEwmtBqsEh8ll2t\r
+       Vsdf3rMmTMiEeNBR+AjyTszyWjHpdqiiWh6mpeRzpD0wS5+BevRifwjs35S68+2vcNIo\r
+       MWtwMklhILbOg2vz6l5kcCUpl0Eipe4FomlDix2175qiJacDbv6pqnS/50P1DDaSAHEw\r
+       UNPqhXSPwUUZlASkTuaY1+8vFDhYtKUQS7a5E/3X1CNqFCootyFpYPyZd925xDdjfo6E\r
+       RIMA==\r
+X-Gm-Message-State:\r
+ ALoCoQlbFLnPJDOyMJE5lR114RFoyEHrcG8yU9tXQUCzuawoiXrKDwI3p3MNBLgjdIx/6NRprwzU\r
+X-Received: by 10.204.68.142 with SMTP id v14mr1341100bki.18.1384437764452;\r
+       Thu, 14 Nov 2013 06:02:44 -0800 (PST)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPSA id pn6sm3481861bkb.14.2013.11.14.06.02.42\r
+       for <multiple recipients>\r
+       (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+       Thu, 14 Nov 2013 06:02:43 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 4/5] compact: unconditionally attempt to remove old wip\r
+       database compact directory\r
+In-Reply-To: <1384362167-12740-5-git-send-email-tomi.ollila@iki.fi>\r
+References: <1384362167-12740-1-git-send-email-tomi.ollila@iki.fi>\r
+       <1384362167-12740-5-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.16+115~gd647c65 (http://notmuchmail.org) Emacs/23.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 14 Nov 2013 15:02:27 +0100\r
+Message-ID: <877gcbnkss.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Thu, 14 Nov 2013 14:09:56 -0000\r
+\r
+On Wed, 13 Nov 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:\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 ee09c5e..4b5ac64 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -920,6 +920,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
+I thought we avoid using // comments. Otherwise LGTM.\r
+\r
+> +\r
+>      try {\r
+>      NotmuchCompactor compactor (status_cb, closure);\r
+>  \r
+> -- \r
+> 1.8.3.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r