Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 12EA0431FBD for ; Thu, 14 Nov 2013 14:03:51 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wZVNZu7GG1zu for ; Thu, 14 Nov 2013 14:03:43 -0800 (PST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id 8C604431FDD for ; Thu, 14 Nov 2013 14:03:36 -0800 (PST) Received: by guru.guru-group.fi (Postfix, from userid 501) id 17D9310009D; Fri, 15 Nov 2013 00:03:29 +0200 (EET) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH v3 3/5] compact: preserve backup database until compacted database is in place Date: Fri, 15 Nov 2013 00:03:25 +0200 Message-Id: <1384466607-28298-1-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 1.8.0 In-Reply-To: References: Cc: tomi.ollila@iki.fi X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 22:03:51 -0000 It is less error prone and window of failure opportunity is smaller if the old (backup) database is always renamed (instead of sometimes rmtree'd) before new (compacted) database is put into its place. Finally rmtree() old database in case old database backup is not kept. --- The patches 3-5 in this series are updated based on Jani's comments. I've kept the fprintf(stderr,...)'s due to reasons explained in id:m28uwquccd.fsf@guru.guru-group.fi Diff v2-v3 for first (3/5) patch. Second (4/5) has just // -> /* .. */ change. |--- a/lib/database.cc |+++ b/lib/database.cc |@@ -906,17 +906,19 @@ notmuch_database_compact (const char *path, | } | keep_backup = FALSE; | } |- else |+ else { | keep_backup = TRUE; |+ } | | if (stat (backup_path, &statbuf) != -1) { |- fprintf (stderr, "Backup path already exists: %s\n", backup_path); |+ fprintf (stderr, "Path already exists: %s\n", backup_path); | ret = NOTMUCH_STATUS_FILE_ERROR; | goto DONE; | } | if (errno != ENOENT) { |- fprintf (stderr, "Unknown error while stat()ing backup path: %s\n", |+ fprintf (stderr, "Unknown error while stat()ing path: %s\n", | strerror (errno)); |+ ret = NOTMUCH_STATUS_FILE_ERROR; | goto DONE; | } lib/database.cc | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 3530cb6..d79cc30 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -873,6 +873,7 @@ notmuch_database_compact (const char *path, notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; notmuch_database_t *notmuch = NULL; struct stat statbuf; + notmuch_bool_t keep_backup; local = talloc_new (NULL); if (! local) @@ -898,17 +899,27 @@ notmuch_database_compact (const char *path, goto DONE; } - if (backup_path != NULL) { - if (stat (backup_path, &statbuf) != -1) { - fprintf (stderr, "Backup path already exists: %s\n", backup_path); - ret = NOTMUCH_STATUS_FILE_ERROR; - goto DONE; - } - if (errno != ENOENT) { - fprintf (stderr, "Unknown error while stat()ing backup path: %s\n", - strerror (errno)); + if (backup_path == NULL) { + if (! (backup_path = talloc_asprintf (local, "%s.old", xapian_path))) { + ret = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; } + keep_backup = FALSE; + } + else { + keep_backup = TRUE; + } + + if (stat (backup_path, &statbuf) != -1) { + fprintf (stderr, "Path already exists: %s\n", backup_path); + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; + } + if (errno != ENOENT) { + fprintf (stderr, "Unknown error while stat()ing path: %s\n", + strerror (errno)); + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; } try { @@ -924,14 +935,10 @@ notmuch_database_compact (const char *path, goto DONE; } - if (backup_path) { - if (rename (xapian_path, backup_path)) { - fprintf (stderr, "Error moving old database out of the way\n"); - ret = NOTMUCH_STATUS_FILE_ERROR; - goto DONE; - } - } else { - rmtree (xapian_path); + if (rename (xapian_path, backup_path)) { + fprintf (stderr, "Error moving old database out of the way\n"); + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; } if (rename (compact_xapian_path, xapian_path)) { @@ -940,6 +947,9 @@ notmuch_database_compact (const char *path, goto DONE; } + if (! keep_backup) + rmtree (backup_path); + DONE: if (notmuch) notmuch_database_destroy (notmuch); -- 1.8.0