aboutsummaryrefslogtreecommitdiff
path: root/lib/open.cc
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2021-05-17 23:06:01 -0300
committerDavid Bremner <david@tethera.net>2021-06-27 14:03:00 -0300
commite2a3e5fa51122efb0f5ac836e536881d97deef1a (patch)
tree1445b342be81e30408f9690698f237c3dd06a1fd /lib/open.cc
parent8aabddb043d6bf5bd8a19884b3c456ba9d4634cb (diff)
lib: autocommit after some number of completed transactions
This change addresses two known issues with large sets of changes to the database. The first is that as reported by Steven Allen [1], notmuch commits are not "flushed" when they complete, which means that if there is an open transaction when the database closes (or e.g. the program crashes) then all changes since the last commit will be discarded (nothing is irrecoverably lost for "notmuch new", as the indexing process just restarts next time it is run). This does not really "fix" the issue reported in [1]; that seems rather difficult given how transactions work in Xapian. On the other hand, with the default settings, this should mean one only loses less than a minutes worth of work. The second issue is the occasionally reported "storm" of disk writes when notmuch finishes. I don't yet have a test for this, but I think committing as we go should reduce the amount of work when finalizing the database. [1]: id:20151025210215.GA3754@stebalien.com
Diffstat (limited to 'lib/open.cc')
-rw-r--r--lib/open.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/open.cc b/lib/open.cc
index 72f1232c..7b95c5b1 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -256,6 +256,8 @@ _alloc_notmuch ()
notmuch->writable_xapian_db = NULL;
notmuch->config_path = NULL;
notmuch->atomic_nesting = 0;
+ notmuch->transaction_count = 0;
+ notmuch->transaction_threshold = 0;
notmuch->view = 1;
return notmuch;
}
@@ -365,6 +367,8 @@ _finish_open (notmuch_database_t *notmuch,
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
char *incompat_features;
char *message = NULL;
+ const char *autocommit_str;
+ char *autocommit_end;
unsigned int version;
const char *database_path = notmuch_database_get_path (notmuch);
@@ -461,6 +465,14 @@ _finish_open (notmuch_database_t *notmuch,
if (status)
goto DONE;
+ autocommit_str = notmuch_config_get (notmuch, NOTMUCH_CONFIG_AUTOCOMMIT);
+ if (unlikely (! autocommit_str)) {
+ INTERNAL_ERROR ("missing configuration for autocommit");
+ }
+ notmuch->transaction_threshold = strtoul (autocommit_str, &autocommit_end, 10);
+ if (*autocommit_end != '\0')
+ INTERNAL_ERROR ("Malformed database database.autocommit value: %s", autocommit_str);
+
status = _notmuch_database_setup_standard_query_fields (notmuch);
if (status)
goto DONE;