--- /dev/null
+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 99B81431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 25 Nov 2012 08:15:55 -0800 (PST)\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 vSwYyDBotsF6 for <notmuch@notmuchmail.org>;\r
+ Sun, 25 Nov 2012 08:15:53 -0800 (PST)\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 BCD32431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 25 Nov 2012 08:15:52 -0800 (PST)\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 1Tcerz-00065i-T6; Sun, 25 Nov 2012 16:15:48 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] 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 1Tcerz-0001Wa-H7; Sun, 25 Nov 2012 16:15:47 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 15/20] insert: fsync new directory after rename\r
+In-Reply-To: <1353806206-29133-16-git-send-email-novalazy@gmail.com>\r
+References: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+ <1353806206-29133-16-git-send-email-novalazy@gmail.com>\r
+User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 25 Nov 2012 16:15:50 +0000\r
+Message-ID: <87624tk6a1.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: dd4d33770611628382466e9c89ac22ec (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.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: Sun, 25 Nov 2012 16:15:55 -0000\r
+\r
+On Sun, 25 Nov 2012, Peter Wang <novalazy@gmail.com> wrote:\r
+> After moving the file from the 'tmp' to the 'new' directory,\r
+> fsync on the 'new' directory for durability.\r
+> ---\r
+> notmuch-insert.c | 39 ++++++++++++++++++++++++++++++++-------\r
+> 1 file changed, 32 insertions(+), 7 deletions(-)\r
+>\r
+> diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+> index f09c579..831b322 100644\r
+> --- a/notmuch-insert.c\r
+> +++ b/notmuch-insert.c\r
+> @@ -143,10 +143,10 @@ maildir_create_folder (void *ctx, const char *dir)\r
+> /* Open a unique file in the Maildir 'tmp' directory.\r
+> * Returns the file descriptor on success, or -1 on failure.\r
+> * On success, file paths into the 'tmp' and 'new' directories are returned\r
+> - * via tmppath and newpath. */\r
+> + * via tmppath and newpath, and the path of the 'new' directory in newdir. */\r
+\r
+I found this comment very difficult to understand since it looks like\r
+the 'new' directory gets returned twice. Perhaps something like\r
+\r
+"On success, file paths for the message in the 'tmp' and 'new'\r
+directories are returned via tmppath and newpath, and the path of the\r
+'new' directory itself in newdir."\r
+\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+> static int\r
+> maildir_open_tmp_file (void *ctx, const char *dir,\r
+> - char **tmppath, char **newpath)\r
+> + char **tmppath, char **newpath, char **newdir)\r
+> {\r
+> pid_t pid;\r
+> char hostname[256];\r
+> @@ -183,8 +183,9 @@ maildir_open_tmp_file (void *ctx, const char *dir,\r
+> return -1;\r
+> }\r
+> \r
+> + *newdir = talloc_asprintf (ctx, "%s/new", dir);\r
+> *newpath = talloc_asprintf (ctx, "%s/new/%s", dir, filename);\r
+> - if (! *newpath) {\r
+> + if (! *newdir || ! *newpath) {\r
+> fprintf (stderr, "Out of memory\n");\r
+> close (fd);\r
+> unlink (*tmppath);\r
+> @@ -204,14 +205,31 @@ maildir_open_tmp_file (void *ctx, const char *dir,\r
+> * http://wiki.dovecot.org/MailboxFormat/Maildir#Mail_delivery\r
+> */\r
+> static notmuch_bool_t\r
+> -maildir_move_tmp_to_new (const char *tmppath, const char *newpath)\r
+> +maildir_move_tmp_to_new (const char *tmppath, const char *newpath,\r
+> + const char *newdir)\r
+> {\r
+> + notmuch_bool_t ret;\r
+> + int fd;\r
+> +\r
+> if (rename (tmppath, newpath) != 0) {\r
+> fprintf (stderr, "Error: rename() failed: %s\n", strerror (errno));\r
+> return FALSE;\r
+> }\r
+> \r
+> - return TRUE;\r
+> + /* Sync the 'new' directory after rename for durability. */\r
+> + ret = TRUE;\r
+> + fd = open (newdir, O_RDONLY);\r
+> + if (fd == -1) {\r
+> + fprintf (stderr, "Error: open() dir failed: %s\n", strerror (errno));\r
+> + ret = FALSE;\r
+> + }\r
+> + if (ret && fsync (fd) != 0) {\r
+> + fprintf (stderr, "Error: fsync() dir failed: %s\n", strerror (errno));\r
+> + ret = FALSE;\r
+> + }\r
+> + if (fd != -1)\r
+> + close (fd);\r
+> + return ret;\r
+> }\r
+> \r
+> /* Copy the contents of fdin into fdout. */\r
+> @@ -307,6 +325,12 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path,\r
+> \r
+> notmuch_message_thaw (message);\r
+> \r
+> + /* notmuch_message_tags_to_maildir_flags may rename the message file\r
+> + * once more, and does so without fsyncing the directory afterwards.\r
+> + * rename() is atomic so after a crash the file should appear under\r
+> + * the old or new name. notmuch new should be able to rename the file\r
+> + * again if required, so another fsync is not required, I think.\r
+> + */\r
+> notmuch_message_tags_to_maildir_flags (message);\r
+> \r
+> notmuch_message_destroy (message);\r
+> @@ -321,10 +345,11 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+> {\r
+> char *tmppath;\r
+> char *newpath;\r
+> + char *newdir;\r
+> int fdout;\r
+> notmuch_bool_t ret;\r
+> \r
+> - fdout = maildir_open_tmp_file (ctx, dir, &tmppath, &newpath);\r
+> + fdout = maildir_open_tmp_file (ctx, dir, &tmppath, &newpath, &newdir);\r
+> if (fdout < 0) {\r
+> return FALSE;\r
+> }\r
+> @@ -335,7 +360,7 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+> }\r
+> close (fdout);\r
+> if (ret) {\r
+> - ret = maildir_move_tmp_to_new (tmppath, newpath);\r
+> + ret = maildir_move_tmp_to_new (tmppath, newpath, newdir);\r
+> }\r
+> if (!ret) {\r
+> unlink (tmppath);\r
+> -- \r
+> 1.7.12.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff