[PATCH v3 14/20] insert: fsync new directory after rename

diff --git a/45/7247e710a027cbc0472b2aec464cdbbdc38186 b/45/7247e710a027cbc0472b2aec464cdbbdc38186
new file mode 100644 (file)
index 0000000..afb26cd
--- /dev/null
+++ b/45/7247e710a027cbc0472b2aec464cdbbdc38186
@@ -0,0 +1,170 @@
+Return-Path: <novalazy@gmail.com>\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 5011F429E31\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:55 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 khgi01zL7bvl for <notmuch@notmuchmail.org>;\r
+       Sat, 19 Jan 2013 16:51:54 -0800 (PST)\r
+Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com\r
+       [209.85.220.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 5CECF431FCF\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:42 -0800 (PST)\r
+Received: by mail-pa0-f47.google.com with SMTP id fa10so2753365pad.20\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:41 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references; bh=gUz+F2dlXciewub+lsh7NrpMmtsK7aYRFpop9lh8aNY=;\r
+       b=GuaxkEsN1jqBQzifuAKtgGfcfqAa3FPWoBZVucb9iaogJyYvbOmoTxq9F3S6nq8iEk\r
+       eiY8nkPMVG7r5wVpDKAsFWXEwg3JFLl1vUgozGpksMsllKrSmtjLJ540BZLbIHjuJV79\r
+       mFeMXrvs9pdL/66GPPnJ7ngrSUPLSHhl1TlJyxCj5Eid7wxZn7sLmDsARioq/NcesD1I\r
+       yu1JZ9AX7XMJYR7WUY/tHF+oVocOWc/KrSAJ+3J/t+HWo3M4if+L939ctkpAaCDYbScA\r
+       LmsVwMb0qXYEMfEe2WzXndLRHGxzgGsUuqhGjWBqVTg4rzkol6NMoeL0Dxs48QSelrG8\r
+       jxpA==\r
+X-Received: by 10.66.73.105 with SMTP id k9mr36422216pav.37.1358643101494;\r
+       Sat, 19 Jan 2013 16:51:41 -0800 (PST)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id ux4sm5805088pbc.25.2013.01.19.16.51.39\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 19 Jan 2013 16:51:40 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 14/20] insert: fsync new directory after rename\r
+Date: Sun, 20 Jan 2013 11:49:58 +1100\r
+Message-Id: <1358643004-14522-15-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\r
+References: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\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, 20 Jan 2013 00:51:55 -0000\r
+\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 | 41 ++++++++++++++++++++++++++++++++++-------\r
+ 1 file changed, 34 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 60855c1..c4d5e75 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -56,6 +56,28 @@ check_folder_name (const char *folder)\r
+     }\r
+ }\r
+ \r
++/* Call fsync() on a directory path. */\r
++static notmuch_bool_t\r
++sync_dir (const char *dir)\r
++{\r
++    notmuch_bool_t ret;\r
++    int fd;\r
++\r
++    ret = TRUE;\r
++    fd = open (dir, 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
+ /* Make the given directory, succeeding if it already exists. */\r
+ static notmuch_bool_t\r
+ make_directory (char *path, int mode)\r
+@@ -140,10 +162,11 @@ 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 for the message in the 'tmp' and 'new'\r
+- * directories are returned via tmppath and newpath. */\r
++ * directories are returned via tmppath and newpath,\r
++ * and the path of the 'new' directory itself in newdir. */\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
+@@ -180,8 +203,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
+@@ -201,14 +225,16 @@ 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
+     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
++    return sync_dir (newdir);\r
+ }\r
+ \r
+ /* Copy the contents of standard input (fdin) into fdout. */\r
+@@ -297,10 +323,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
+@@ -311,7 +338,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