From: Mark Walters Date: Sun, 22 Apr 2012 07:34:07 +0000 (+0100) Subject: Re: [PATCH v2 2/4] new: Handle fatal errors in remove_filename and _remove_directory X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0b1633b7bd758a2274e157f03679ffeded701ccf;p=notmuch-archives.git Re: [PATCH v2 2/4] new: Handle fatal errors in remove_filename and _remove_directory --- diff --git a/14/cd44fc5da656b52c1d2075886d6f909dd027b1 b/14/cd44fc5da656b52c1d2075886d6f909dd027b1 new file mode 100644 index 000000000..41bb30d6d --- /dev/null +++ b/14/cd44fc5da656b52c1d2075886d6f909dd027b1 @@ -0,0 +1,182 @@ +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 615A3431FAF + for ; Sun, 22 Apr 2012 00:33:58 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 ScPhPYGZf3zO for ; + Sun, 22 Apr 2012 00:33:56 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id ECD98431FAE + for ; Sun, 22 Apr 2012 00:33:55 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1SLrIq-00021L-Gq; Sun, 22 Apr 2012 08:33:51 +0100 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1SLrIq-0007ge-5N; Sun, 22 Apr 2012 08:33:48 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH v2 2/4] new: Handle fatal errors in remove_filename and + _remove_directory +In-Reply-To: <1335068868-12593-3-git-send-email-amdragon@mit.edu> +References: <1330357759-1337-1-git-send-email-amdragon@mit.edu> + <1335068868-12593-1-git-send-email-amdragon@mit.edu> + <1335068868-12593-3-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.12+110~gbc97b4a (http://notmuchmail.org) Emacs/23.3.1 + (x86_64-pc-linux-gnu) +Date: Sun, 22 Apr 2012 08:34:07 +0100 +Message-ID: <87aa24kyog.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 7a29a6c86919913d8a1e5551ff7ee55e (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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: Sun, 22 Apr 2012 07:33:58 -0000 + +On Sun, 22 Apr 2012, Austin Clements wrote: +> Previously such errors were simply ignored. Now they cause an +> immediate cleanup and abort. +> --- +> notmuch-new.c | 25 +++++++++++++++++++------ +> 1 files changed, 19 insertions(+), 6 deletions(-) +> +> diff --git a/notmuch-new.c b/notmuch-new.c +> index 15c0b36..92e0489 100644 +> --- a/notmuch-new.c +> +++ b/notmuch-new.c +> @@ -785,8 +785,10 @@ remove_filename (notmuch_database_t *notmuch, +> add_files_state->renamed_messages++; +> if (add_files_state->synchronize_flags == TRUE) +> notmuch_message_maildir_flags_to_tags (message); +> - } else +> + status = NOTMUCH_STATUS_SUCCESS; +> + } else if (status == NOTMUCH_STATUS_SUCCESS) { +> add_files_state->removed_messages++; +> + } +> notmuch_message_destroy (message); +> notmuch_database_end_atomic (notmuch); +> return status; +> @@ -794,12 +796,13 @@ remove_filename (notmuch_database_t *notmuch, +> +> /* Recursively remove all filenames from the database referring to +> * 'path' (or to any of its children). */ +> -static void +> +static notmuch_status_t +> _remove_directory (void *ctx, +> notmuch_database_t *notmuch, +> const char *path, +> add_files_state_t *add_files_state) +> { +> + notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; +> notmuch_directory_t *directory; +> notmuch_filenames_t *files, *subdirs; +> char *absolute; +> @@ -812,8 +815,10 @@ _remove_directory (void *ctx, +> { +> absolute = talloc_asprintf (ctx, "%s/%s", path, +> notmuch_filenames_get (files)); +> - remove_filename (notmuch, absolute, add_files_state); +> + status = remove_filename (notmuch, absolute, add_files_state); +> talloc_free (absolute); +> + if (status) +> + goto DONE; +> } +> +> for (subdirs = notmuch_directory_get_child_directories (directory); +> @@ -822,11 +827,15 @@ _remove_directory (void *ctx, +> { +> absolute = talloc_asprintf (ctx, "%s/%s", path, +> notmuch_filenames_get (subdirs)); +> - _remove_directory (ctx, notmuch, absolute, add_files_state); +> + status = _remove_directory (ctx, notmuch, absolute, add_files_state); +> talloc_free (absolute); +> + if (status) +> + goto DONE; +> } +> +> + DONE: +> notmuch_directory_destroy (directory); +> + return NOTMUCH_STATUS_SUCCESS; + +Doesn't this need to be return status or something? + +Best wishes + +Mark + + +> } +> +> int +> @@ -944,7 +953,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[]) +> +> gettimeofday (&tv_start, NULL); +> for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) { +> - remove_filename (notmuch, f->filename, &add_files_state); +> + ret = remove_filename (notmuch, f->filename, &add_files_state); +> + if (ret) +> + goto DONE; +> if (do_print_progress) { +> do_print_progress = 0; +> generic_print_progress ("Cleaned up", "messages", +> @@ -955,7 +966,9 @@ notmuch_new_command (void *ctx, int argc, char *argv[]) +> +> gettimeofday (&tv_start, NULL); +> for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) { +> - _remove_directory (ctx, notmuch, f->filename, &add_files_state); +> + ret = _remove_directory (ctx, notmuch, f->filename, &add_files_state); +> + if (ret) +> + goto DONE; +> if (do_print_progress) { +> do_print_progress = 0; +> generic_print_progress ("Cleaned up", "directories", +> -- +> 1.7.9.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch