mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-25 10:54:52 +01:00
dump: make dump take Xapian write lock
Dump currently only takes the read lock. Xapian can cope with some changes while maintaining a read snapshot but with more changes it fails. Currently notmuch just gives a xapian error. To avoid this we take the write lock when dumping. This prevents other notmuch processes from modifying the xapian database preventing this error. Discussion with Olly on irc indicates that this is currently the best solution: in xapian trunk there may be better possibilities using snapshots but they need to make it to a release and propogate out to users before we can switch approach. Finally, this breaks one use case: pipelines of the form notmuch dump | ... | notmuch restore According to Olly this is already very fragile: it will only work on small databases. One of the tests relies on this behaviour so fix that to store the dump rather than use a pipe.
This commit is contained in:
parent
567aab405b
commit
bbbdf0478e
2 changed files with 3 additions and 3 deletions
|
@ -212,7 +212,7 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])
|
|||
int ret;
|
||||
|
||||
if (notmuch_database_open (notmuch_config_get_database_path (config),
|
||||
NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much))
|
||||
NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))
|
||||
return EXIT_FAILURE;
|
||||
|
||||
char *output_file_name = NULL;
|
||||
|
|
|
@ -247,8 +247,8 @@ ${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG} \
|
|||
notmuch dump --format=batch-tag | sed 's/^.* -- /+common_tag -- /' | \
|
||||
sort > EXPECTED
|
||||
|
||||
notmuch dump --format=batch-tag | sed 's/^.* -- / -- /' | \
|
||||
notmuch restore --format=batch-tag
|
||||
notmuch dump --format=batch-tag | sed 's/^.* -- / -- /' > INTERMEDIATE_STEP
|
||||
notmuch restore --format=batch-tag < INTERMEDIATE_STEP
|
||||
|
||||
notmuch tag --batch < EXPECTED
|
||||
|
||||
|
|
Loading…
Reference in a new issue