Re: [PATCH 1/3] new: Consistently treat fatal errors as fatal

diff --git a/2d/309ca70c3f7b597a129960b12869fae8130b54 b/2d/309ca70c3f7b597a129960b12869fae8130b54
new file mode 100644 (file)
index 0000000..6a55ca0
--- /dev/null
+++ b/2d/309ca70c3f7b597a129960b12869fae8130b54
@@ -0,0 +1,170 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 6A2AF431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 16 Apr 2012 08:52:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 PCwK7jBgW4sL for <notmuch@notmuchmail.org>;\r
+       Mon, 16 Apr 2012 08:52:55 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A92F7431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 16 Apr 2012 08:52:55 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SJoEV-0001Au-C9; Mon, 16 Apr 2012 16:52:54 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SJoEV-0005AI-1a; Mon, 16 Apr 2012 16:52:51 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/3] new: Consistently treat fatal errors as fatal\r
+In-Reply-To: <1330357759-1337-2-git-send-email-amdragon@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+       <1330357759-1337-2-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.12+110~gbc97b4a (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 16 Apr 2012 16:53:10 +0100\r
+Message-ID: <87zkab4qs9.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: fdaff784e11779ab29d77ded90ba2f51 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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, 16 Apr 2012 15:52:57 -0000\r
+\r
+\r
+On Mon, 27 Feb 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> Previously, fatal errors in add_files_recursive were not treated as\r
+> fatal by its callers (including itself!) and add_files_recursive\r
+> sometimes returned errors on non-fatal conditions.  This makes\r
+> add_files_recursive errors consistently fatal and updates all callers\r
+> to treat them as fatal.\r
+\r
+Hi I have attempted to review this but am feeling a little out of my\r
+depth. This patch seems fine except for one thing I am unsure about:\r
+\r
+> ---\r
+>  notmuch-new.c |   13 ++++++++-----\r
+>  1 files changed, 8 insertions(+), 5 deletions(-)\r
+>\r
+> diff --git a/notmuch-new.c b/notmuch-new.c\r
+> index 4f13535..bd9786a 100644\r
+> --- a/notmuch-new.c\r
+> +++ b/notmuch-new.c\r
+> @@ -308,7 +308,6 @@ add_files_recursive (notmuch_database_t *notmuch,\r
+>      if (num_fs_entries == -1) {\r
+>      fprintf (stderr, "Error opening directory %s: %s\n",\r
+>               path, strerror (errno));\r
+> -    ret = NOTMUCH_STATUS_FILE_ERROR;\r
+>      goto DONE;\r
+>      }\r
+>  \r
+\r
+If I understand this, then this change makes a failure to open a\r
+directory non-fatal. In the comment before the function it says\r
+\r
+ *     Also, we don't immediately act on file/directory removal since we\r
+ *     must ensure that in the case of a rename that the new filename is\r
+ *     added before the old filename is removed, (so that no information\r
+ *     is lost from the database).\r
+ \r
+I am  worried that we could fail to find some files because of the\r
+file error above, and then we delete them from the database. Maybe this\r
+could only happen if those emails have just been moved to this\r
+file-error directory?\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+> @@ -351,8 +350,10 @@ add_files_recursive (notmuch_database_t *notmuch,\r
+>  \r
+>      next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);\r
+>      status = add_files_recursive (notmuch, next, state);\r
+> -    if (status && ret == NOTMUCH_STATUS_SUCCESS)\r
+> +    if (status) {\r
+>          ret = status;\r
+> +        goto DONE;\r
+> +    }\r
+>      talloc_free (next);\r
+>      next = NULL;\r
+>      }\r
+> @@ -933,6 +934,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+>      }\r
+>  \r
+>      ret = add_files (notmuch, db_path, &add_files_state);\r
+> +    if (ret)\r
+> +    goto DONE;\r
+>  \r
+>      gettimeofday (&tv_start, NULL);\r
+>      for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {\r
+> @@ -965,6 +968,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+>      }\r
+>      }\r
+>  \r
+> +  DONE:\r
+>      talloc_free (add_files_state.removed_files);\r
+>      talloc_free (add_files_state.removed_directories);\r
+>      talloc_free (add_files_state.directory_mtimes);\r
+> @@ -1012,10 +1016,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+>  \r
+>      printf ("\n");\r
+>  \r
+> -    if (ret) {\r
+> -    printf ("\nNote: At least one error was encountered: %s\n",\r
+> +    if (ret)\r
+> +    printf ("\nNote: A fatal error was encountered: %s\n",\r
+>              notmuch_status_to_string (ret));\r
+> -    }\r
+>  \r
+>      notmuch_database_close (notmuch);\r
+>  \r
+> -- \r
+> 1.7.7.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r