debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: consider files vanishing during notmuch new non-fatal

Browse source 
If some software other than notmuch new renames or removes files
during the notmuch new scan (specifically after scandir but before
indexing the file), keep going instead of bailing out. Failing to
index the file is just a race condition between notmuch and the other
software; the rename could happen after the notmuch new scan
anyway. It's not fatal, and we'll catch the renamed files on the next
scan.

Add a new exit code for when files vanished, so the caller has a
chance to detect the race and re-run notmuch new to recover.

Reported by Paul Wise <pabs@debian.org> at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=843127
This commit is contained in:
Jani Nikula 2016-11-21 22:14:33 +02:00 committed by David Bremner
parent 3891d6cb98
commit f5185881f7
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
notmuch-client.h
View file

@ -25,6 +25,7 @@
#define _GNU_SOURCE /* for getline */ #define _GNU_SOURCE /* for getline */
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <sysexits.h>
#include "compat.h" #include "compat.h"
@ -114,6 +115,16 @@ chomp_newline (char *str)
str[strlen(str)-1] = '\0'; str[strlen(str)-1] = '\0';
} }
/* Exit status code indicating temporary failure; user is invited to
* retry.
*
* For example, file(s) in the mail store were removed or renamed
* after notmuch new scanned the directories but before indexing the
* file(s). If the file was renamed, the indexing might not be
* complete, and the user is advised to re-run notmuch new.
*/
#define NOTMUCH_EXIT_TEMPFAIL EX_TEMPFAIL
/* Exit status code indicating the requested format version is too old /* Exit status code indicating the requested format version is too old
* (support for that version has been dropped). CLI code should use * (support for that version has been dropped). CLI code should use
* notmuch_exit_if_unsupported_format rather than directly exiting * notmuch_exit_if_unsupported_format rather than directly exiting

15
notmuch-new.c
View file

@ -53,6 +53,7 @@ typedef struct {
int total_files; int total_files;
int processed_files; int processed_files;
int added_messages, removed_messages, renamed_messages; int added_messages, removed_messages, renamed_messages;
int vanished_files;
struct timeval tv_start; struct timeval tv_start;
_filename_list_t *removed_files; _filename_list_t *removed_files;
@ -280,11 +281,13 @@ add_file (notmuch_database_t *notmuch, const char *filename,
case NOTMUCH_STATUS_FILE_NOT_EMAIL: case NOTMUCH_STATUS_FILE_NOT_EMAIL:
fprintf (stderr, "Note: Ignoring non-mail file: %s\n", filename); fprintf (stderr, "Note: Ignoring non-mail file: %s\n", filename);
break; break;
/* Fatal issues. Don't process anymore. */
case NOTMUCH_STATUS_FILE_ERROR: case NOTMUCH_STATUS_FILE_ERROR:
/* Someone renamed/removed the file between scandir and now. */
state->vanished_files++;
fprintf (stderr, "Unexpected error with file %s\n", filename); fprintf (stderr, "Unexpected error with file %s\n", filename);
(void) print_status_database ("add_file", notmuch, status); (void) print_status_database ("add_file", notmuch, status);
goto DONE; break;
/* Fatal issues. Don't process anymore. */
case NOTMUCH_STATUS_READ_ONLY_DATABASE: case NOTMUCH_STATUS_READ_ONLY_DATABASE:
case NOTMUCH_STATUS_XAPIAN_EXCEPTION: case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
case NOTMUCH_STATUS_OUT_OF_MEMORY: case NOTMUCH_STATUS_OUT_OF_MEMORY:
@ -1151,5 +1154,11 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])
if (!no_hooks && !ret && !interrupted) if (!no_hooks && !ret && !interrupted)
ret = notmuch_run_hook (db_path, "post-new"); ret = notmuch_run_hook (db_path, "post-new");
return ret || interrupted ? EXIT_FAILURE : EXIT_SUCCESS; if (ret || interrupted)
return EXIT_FAILURE;
if (add_files_state.vanished_files)
return NOTMUCH_EXIT_TEMPFAIL;
return EXIT_SUCCESS;
} }