[PATCH v2 14/20] insert: fsync after writing tmp file

diff --git a/3f/3d21cdafef4da424e3c47e814e4fa10146991d b/3f/3d21cdafef4da424e3c47e814e4fa10146991d
new file mode 100644 (file)
index 0000000..4a89167
--- /dev/null
+++ b/3f/3d21cdafef4da424e3c47e814e4fa10146991d
@@ -0,0 +1,85 @@
+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 A8679431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:24 -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 sYsehKSp+Zvs for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 17:18:24 -0800 (PST)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+       [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4502A431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:24 -0800 (PST)\r
+Received: by mail-pb0-f53.google.com with SMTP id jt11so7944513pbb.26\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:24 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=0ngTvqX/MGy5FRVrbSMHwO8FgImgilRhjT4Oplgn2oI=;\r
+       b=tZq+IQbDDsTfC2XJXdWKqvwXoTaOVcfgJXJCEK481nyw4B7ZEH6VVYzHOSswOF7d5/\r
+       VHkgTm9strC7r2g2Hjil3P7RSK/yEievbX2PLaoL6mAFJ5fUE8g3bYKKY2LjyMQQ3p20\r
+       qDMVmyeyAciSwcXVzmaV3zNUFRJCKt7S34qyn6Sr2BEq6olZdtZJpzhLS2BkXK/5kUbr\r
+       mZM0OGIN71daYRMWEpyy8L64XDAsjeYn+9z5Sk+AFOiI8HsWwEbEVLsaxgmidWGciWL9\r
+       4YBiRl04gdHgfjI9bAavCorX6Q/J0LKiujyxvakmi5HRrZBwdW4gybqjDbIQupbW+BTi\r
+       o0Kw==\r
+Received: by 10.68.239.104 with SMTP id vr8mr26538950pbc.59.1353806304036;\r
+       Sat, 24 Nov 2012 17:18:24 -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 tm8sm6224230pbc.48.2012.11.24.17.18.21\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 24 Nov 2012 17:18:23 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 14/20] insert: fsync after writing tmp file\r
+Date: Sun, 25 Nov 2012 12:16:40 +1100\r
+Message-Id: <1353806206-29133-15-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+References: <1353806206-29133-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, 25 Nov 2012 01:18:24 -0000\r
+\r
+Flush the tmp file to disk after writing for durability.\r
+---\r
+ notmuch-insert.c | 4 ++++\r
+ 1 file changed, 4 insertions(+)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index b7aef95..f09c579 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -329,6 +329,10 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+       return FALSE;\r
+     }\r
+     ret = copy_fd_data (fdin, fdout);\r
++    if (ret && fsync (fdout) != 0) {\r
++      fprintf (stderr, "Error: fsync failed: %s\n", strerror (errno));\r
++      ret = FALSE;\r
++    }\r
+     close (fdout);\r
+     if (ret) {\r
+       ret = maildir_move_tmp_to_new (tmppath, newpath);\r
+-- \r
+1.7.12.1\r
+\r