From: Tomi Ollila Date: Mon, 11 Nov 2013 17:55:36 +0000 (+0200) Subject: [PATCH 1/3] lib: make compact to keep backup until new database in place X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2391998ade27874138543bb2ba40762c09ddc1c0;p=notmuch-archives.git [PATCH 1/3] lib: make compact to keep backup until new database in place --- diff --git a/e2/b4f9365501d05eedeedb9324cad4811145debd b/e2/b4f9365501d05eedeedb9324cad4811145debd new file mode 100644 index 000000000..e0c2bd749 --- /dev/null +++ b/e2/b4f9365501d05eedeedb9324cad4811145debd @@ -0,0 +1,141 @@ +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 152CD431FDD + for ; Mon, 11 Nov 2013 09:56:15 -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 lf1FaGgTkvmV for ; + Mon, 11 Nov 2013 09:56:09 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 5D7CC429E4E + for ; Mon, 11 Nov 2013 09:55:58 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id F189E1000E5; Mon, 11 Nov 2013 19:55:43 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 1/3] lib: make compact to keep backup until new database in + place +Date: Mon, 11 Nov 2013 19:55:36 +0200 +Message-Id: <1384192538-15291-2-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1384192538-15291-1-git-send-email-tomi.ollila@iki.fi> +References: <1384192538-15291-1-git-send-email-tomi.ollila@iki.fi> +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: Mon, 11 Nov 2013 17:56:15 -0000 + +It is less error prone and window of failure opportunity is smaller +if the old database is always renamed (instead of sometimes rmtree'd) +before new database is put into its place. +Finally rmtree() old database in case old database backup is not kept. +--- + lib/database.cc | 44 ++++++++++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 18 deletions(-) + +diff --git a/lib/database.cc b/lib/database.cc +index a021bf1..6b656e9 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -871,6 +871,7 @@ notmuch_database_compact (const char* path, + notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; + notmuch_database_t *notmuch = NULL; + struct stat statbuf; ++ bool keep_backup; + + local = talloc_new (NULL); + if (! local) +@@ -896,17 +897,25 @@ 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, "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)); ++ goto DONE; + } + + try { +@@ -922,14 +931,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)) { +@@ -938,6 +943,9 @@ notmuch_database_compact (const char* path, + goto DONE; + } + ++ if (! keep_backup) ++ rmtree (backup_path); ++ + DONE: + if (notmuch) + notmuch_database_destroy (notmuch); +@@ -1538,7 +1546,7 @@ _notmuch_database_generate_doc_id (notmuch_database_t *notmuch) + notmuch->last_doc_id++; + + if (notmuch->last_doc_id == 0) +- INTERNAL_ERROR ("Xapian document IDs are exhausted.\n"); ++ INTERNAL_ERROR ("Xapian document IDs are exhausted.\n"); + + return notmuch->last_doc_id; + } +-- +1.8.3.1 +