From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 06/14] lib: catch exceptions in n_directory_get_child_directories
Date: Sat, 1 Aug 2020 09:25:55 -0300 [thread overview]
Message-ID: <20200801122603.285803-7-david@tethera.net> (raw)
In-Reply-To: <20200801122603.285803-1-david@tethera.net>
Also clarify API in error case.
---
lib/directory.cc | 23 ++++++++++++++++++++---
lib/notmuch.h | 2 ++
test/T563-lib-directory.sh | 1 -
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/lib/directory.cc b/lib/directory.cc
index b9c3d77f..5d13afec 100644
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -49,6 +49,19 @@ struct _notmuch_directory {
time_t mtime;
};
+#define LOG_XAPIAN_EXCEPTION(directory, error) _log_xapian_exception (__location__, directory, error)
+
+static void
+_log_xapian_exception (const char *where, notmuch_directory_t *dir, const Xapian::Error error) {
+ notmuch_database_t *notmuch = dir->notmuch;
+ _notmuch_database_log (notmuch,
+ "A Xapian exception occurred at %s: %s\n",
+ where,
+ error.get_msg ().c_str ());
+ notmuch->exception_reported = true;
+}
+
+
/* We end up having to call the destructor explicitly because we had
* to use "placement new" in order to initialize C++ objects within a
* block that we allocated with talloc. So C++ is making talloc
@@ -267,14 +280,18 @@ notmuch_filenames_t *
notmuch_directory_get_child_directories (notmuch_directory_t *directory)
{
char *term;
- notmuch_filenames_t *child_directories;
+ notmuch_filenames_t *child_directories = NULL;
term = talloc_asprintf (directory, "%s%u:",
_find_prefix ("directory-direntry"),
directory->document_id);
- child_directories = _create_filenames_for_terms_with_prefix (directory,
- directory->notmuch, term);
+ try {
+ child_directories = _create_filenames_for_terms_with_prefix (directory,
+ directory->notmuch, term);
+ } catch (Xapian::Error &error) {
+ LOG_XAPIAN_EXCEPTION (directory, error);
+ }
talloc_free (term);
diff --git a/lib/notmuch.h b/lib/notmuch.h
index aaf92470..e59fc571 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -2158,6 +2158,8 @@ notmuch_directory_get_child_files (notmuch_directory_t *directory);
*
* The returned filenames will be the basename-entries only (not
* complete paths).
+ *
+ * Returns NULL if it triggers a Xapian exception
*/
notmuch_filenames_t *
notmuch_directory_get_child_directories (notmuch_directory_t *directory);
diff --git a/test/T563-lib-directory.sh b/test/T563-lib-directory.sh
index 15fb8835..5e7da676 100755
--- a/test/T563-lib-directory.sh
+++ b/test/T563-lib-directory.sh
@@ -41,7 +41,6 @@ cat <<'EOF' > c_tail
EOF
test_begin_subtest "get child directories for a closed db"
-test_subtest_known_broken
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
notmuch_filenames_t *children;
--
2.27.0
next prev parent reply other threads:[~2020-08-01 12:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-01 12:25 Final (v2) batch of patches in API exception handling cleanup David Bremner
2020-08-01 12:25 ` [PATCH 01/14] lib: return NULL from n_d_get_default_indexopts on error David Bremner
2020-08-01 12:25 ` [PATCH 02/14] test: add regression test for n_messages_collect_tags David Bremner
2020-08-01 12:25 ` [PATCH 03/14] test: split header for lib-message tests David Bremner
2020-08-01 12:25 ` [PATCH 04/14] test: regression test for n_m_get_filenames David Bremner
2020-08-01 12:25 ` [PATCH 05/14] test: add known broken test for n_directory_get_child_directories David Bremner
2020-08-01 12:25 ` David Bremner [this message]
2020-08-01 12:25 ` [PATCH 07/14] test: add known broken test for n_directory_get_child_files David Bremner
2020-08-01 12:25 ` [PATCH 08/14] lib: catch exceptions in n_directory_get_child_files David Bremner
2020-08-01 12:25 ` [PATCH 09/14] test: known broken test for n_directory_delete with closed db David Bremner
2020-08-01 12:25 ` [PATCH 10/14] lib: fix return value for n_directory_delete David Bremner
2020-08-01 12:26 ` [PATCH 11/14] test: regression test for n_directory_{get,set}_mtime David Bremner
2020-08-01 12:26 ` [PATCH 12/14] test: regression test for n_d_get_config_list on closed db David Bremner
2020-08-01 12:26 ` [PATCH 13/14] test: regression test for traversing config list with " David Bremner
2020-08-01 12:26 ` [PATCH 14/14] test: regression tests for n_indexopts_{get,set}_decrypt_policy David Bremner
2020-08-04 1:38 ` Final (v2) batch of patches in API exception handling cleanup David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200801122603.285803-7-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).