From f1902b7b5b26cf098c6b9e8a223c43585c38fa94 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 29 Oct 2013 18:12:33 +2000 Subject: [PATCH] Re: [PATCH 3/3] compact: Provide user with more error feedback --- b7/35b9d4d68047598c46aa83707f13d596ef6710 | 124 ++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 b7/35b9d4d68047598c46aa83707f13d596ef6710 diff --git a/b7/35b9d4d68047598c46aa83707f13d596ef6710 b/b7/35b9d4d68047598c46aa83707f13d596ef6710 new file mode 100644 index 000000000..686d9fbce --- /dev/null +++ b/b7/35b9d4d68047598c46aa83707f13d596ef6710 @@ -0,0 +1,124 @@ +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 0C374431FDA + for ; Mon, 28 Oct 2013 15:12:46 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 Ly+rAKtuAyDi for ; + Mon, 28 Oct 2013 15:12:36 -0700 (PDT) +Received: from mail-qc0-f176.google.com (mail-qc0-f176.google.com + [209.85.216.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AB54E431FAF + for ; Mon, 28 Oct 2013 15:12:36 -0700 (PDT) +Received: by mail-qc0-f176.google.com with SMTP id s19so4270064qcw.35 + for ; Mon, 28 Oct 2013 15:12:36 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:subject:in-reply-to:references:user-agent:date:message-id + :mime-version:content-type; + bh=nc3Kx9foz5cywStn5uTV8fqfCRqaz27tN0CXfZAA98s=; + b=prStDkHxkfwYMPIjUyH952SynRV980KAtme7WzwZThHMOJ9KPx5aon+KXJuNcDRrYc + 0pGiD80bKsPPQgpynCS9AABL6nOm5dm+68bui2oa4ShFcsi9bvaZWSBSKlsHj/nljhrW + oZ6Icjb42sgFlt+AP4SrlZkscXABsBqWQ2m4UhCTnPSpDWlOsKn8ViV50m9qNlEtOjiX + nu0KyMoufHQtu+YzSx0gdS6ACYS2/BDg/BgphgTv6e3XqGXIBncfKgSc8Z9byoghUE0F + 6zfbBBDosXD4Ar4N59fNfs4lI/43cfZmSiaMnNATodLi1540tzw921kId+0D+Qd1kWnp + jqeg== +X-Received: by 10.49.35.15 with SMTP id d15mr32205872qej.16.1382998355180; + Mon, 28 Oct 2013 15:12:35 -0700 (PDT) +Received: from localhost (physicsnat56.physics.umass.edu. [128.119.50.38]) + by mx.google.com with ESMTPSA id v19sm56969959qaw.0.2013.10.28.15.12.34 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Mon, 28 Oct 2013 15:12:34 -0700 (PDT) +From: Ben Gamari +To: Tomi Ollila , notmuch@notmuchmail.org +Subject: Re: [PATCH 3/3] compact: Provide user with more error feedback +In-Reply-To: +References: <1382905807-22220-1-git-send-email-bgamari.foss@gmail.com> + <1382905807-22220-3-git-send-email-bgamari.foss@gmail.com> + +User-Agent: Notmuch/0.16+107~g1ef2773 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-pc-linux-gnu) +Date: Mon, 28 Oct 2013 18:12:33 -0400 +Message-ID: <87k3gxdoz2.fsf@gmail.com> +MIME-Version: 1.0 +Content-Type: multipart/signed; boundary="=-=-="; + micalg=pgp-sha1; protocol="application/pgp-signature" +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, 28 Oct 2013 22:12:46 -0000 + +--=-=-= +Content-Type: text/plain +Content-Transfer-Encoding: quoted-printable + +Tomi Ollila writes: + +> On Sun, Oct 27 2013, Ben Gamari wrote: +> +>> Provide instructions on what to do when we couldn't move the compacted +>> database into place. +>> +>> Signed-off-by: Ben Gamari +>> --- +>> lib/database.cc | 18 +++++++++++++++++- +>> 1 file changed, 17 insertions(+), 1 deletion(-) +>> +>> diff --git a/lib/database.cc b/lib/database.cc +>> index 57c2292..6f9fed1 100644 +>> --- a/lib/database.cc +>> +++ b/lib/database.cc +>> @@ -938,7 +938,23 @@ notmuch_database_compact (const char* path, +>> } +>>=20=20 +>> if (rename(compact_xapian_path, xapian_path)) { +>> - fprintf (stderr, "Error moving compacted database\n"); +>> + fprintf (stderr, "Error moving compacted database into place: %s\n", s= +trerror(errno)); +>> + fprintf (stderr, "\n"); +>> + fprintf (stderr, "Encountered error %s while moving the compacted data= +base,\n", +>> + strerror(errno)); +> +> You probably missed my comments in id:m2d2mz7qv7.fsf@guru.guru-group.fi ? +> +Indeed I did. My apologies. New set coming. + +Cheers, + +=2D Ben + +--=-=-= +Content-Type: application/pgp-signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.14 (GNU/Linux) + +iQEcBAEBAgAGBQJSbuFRAAoJEErkyLZmeNiDoU0IAIUNvJRyYafxTBynQWLQ1ZmZ +XORG/iFxSe06v2fMvsYQhHUawczBI4qJ5c7IZ44jp9JLSL6oBIITsre8Joyi/+fL +JE2px4aVaPnQ95xilEE2BQxnL6K25NuWozmd2Su7XXgcGZTqaCqjQNccT9hgP9bC +11/vQ+RVoBg7HBOJrlaRAm5MaC6abQDe5iJ8GUtd4GydqNH7McbIq5xlvlLBUnvL +59jNKYtH5WnuZgJ2cQkv5acW6aLJMmMkyfRGAFlWjwvjOaeUC5nGqtJb/aZM2KKb +biVoBJim8W+3IxAuT0AmF21ZSFPipiJhN5EX7150q1w0oJO5tic1TnRF1H2lg/U= +=8kZn +-----END PGP SIGNATURE----- +--=-=-=-- -- 2.26.2