--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 74F7F431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 21:11:14 -0700 (PDT)\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 1CWY6GUiW+Ma for <notmuch@notmuchmail.org>;\r
+ Sat, 21 Apr 2012 21:11:13 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 9BA20431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 21:11:13 -0700 (PDT)\r
+X-AuditID: 12074425-b7f4a6d0000008e0-50-4f9384e1b031\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 1A.8B.02272.1E4839F4; Sun, 22 Apr 2012 00:11:13 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q3M4BCEV005381; \r
+ Sun, 22 Apr 2012 00:11:13 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3M4BAas010145\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 22 Apr 2012 00:11:11 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SLo8k-0005Q9-7z; Sun, 22 Apr 2012 00:11:10 -0400\r
+Date: Sun, 22 Apr 2012 00:11:10 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH 1/3] new: Consistently treat fatal errors as fatal\r
+Message-ID: <20120422041109.GA17810@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+ <1330357759-1337-2-git-send-email-amdragon@mit.edu>\r
+ <87zkab4qs9.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <87zkab4qs9.fsf@qmul.ac.uk>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hRV1n3YMtnfYOZMNovVc3ksrt+cyezA\r
+ 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZWyYMoGx4LNMRf/GW2wNjP9Euxg5OSQETCQ2\r
+ rtjDCmGLSVy4t56ti5GLQ0hgH6PE9TvrWCCcDYwSiy+2MUE4J5kkth1cwwrhLGGU2Hf/NFAZ\r
+ BweLgKpEyyw/kFFsAhoS2/YvZwSxRQR0JG4fWsAOYjMLSEt8+93MBGILC7hJzJ+xmRnE5gWq\r
+ uXH0CSPEzMmMEofmnodKCEqcnPmEBaJZS+LGv5dMILtABi3/xwES5gTatX3zbDYQW1RARWLK\r
+ yW1sExiFZiHpnoWkexZC9wJG5lWMsim5Vbq5iZk5xanJusXJiXl5qUW6Fnq5mSV6qSmlmxhB\r
+ Yc3uorqDccIhpUOMAhyMSjy8L00m+wuxJpYVV+YeYpTkYFIS5dWvBArxJeWnVGYkFmfEF5Xm\r
+ pBYfYpTgYFYS4f0sApTjTUmsrEotyodJSXOwKInzamq98xMSSE8sSc1OTS1ILYLJynBwKEnw\r
+ egLjV0iwKDU9tSItM6cEIc3EwQkynAdo+OtmkOHFBYm5xZnpEPlTjIpS4ryRIM0CIImM0jy4\r
+ XljaecUoDvSKMK8RSBUPMGXBdb8CGswENDghZhLI4JJEhJRUA2PpxQeTD62YPcH4i9Qu9zMb\r
+ /Sd+P3f48FFN0eMXG1iPTZ3Fuk0/RVd7rW5Adta+5d65Fm+qw6uftN6davFR68HvnQ6Sa1vc\r
+ a/kdHjfcfbTgdcd1bW+pfxvDebatbf74tFbap1nRmO3r1RdpndkbkxUWyHzYqv7IcnKg033x\r
+ TXxMTVKXNv78Y+SqxFKckWioxVxUnAgAsTYadRYDAAA=\r
+Cc: notmuch@notmuchmail.org\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: Sun, 22 Apr 2012 04:11:14 -0000\r
+\r
+Quoth Mark Walters on Apr 16 at 4:53 pm:\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
+Hmm. This won't *actively* remove files, since that only happens if\r
+we successfully scan a directory and find a message that's in the\r
+database but not in that directory (*not* scanning the directory won't\r
+add anything to the remove list). However, you are right that if a\r
+message is moved from some other directory into a directory that we\r
+fail to open, that message will be deleted "by omission".\r
+\r
+I've added the error back, along with a comment explaining it.\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
projects / notmuch-archives.git / commitdiff