Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8943:206af25d21bc HEAD
maildir: When saving messages, in some race conditions we might have written a duplicate UID.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 13 Apr 2009 18:23:37 -0400 |
| parents | 653197bf5f55 |
| children | 1143c696126a |
| files | src/lib-index/mail-index.c src/lib-index/mail-index.h src/lib-storage/index/maildir/maildir-uidlist.c |
| diffstat | 3 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-index/mail-index.c Mon Apr 13 18:21:24 2009 -0400 +++ b/src/lib-index/mail-index.c Mon Apr 13 18:23:37 2009 -0400 @@ -540,6 +540,11 @@ return -1; } +bool mail_index_is_in_memory(struct mail_index *index) +{ + return MAIL_INDEX_IS_IN_MEMORY(index); +} + int mail_index_move_to_memory(struct mail_index *index) { struct mail_index_map *map;
--- a/src/lib-index/mail-index.h Mon Apr 13 18:21:24 2009 -0400 +++ b/src/lib-index/mail-index.h Mon Apr 13 18:23:37 2009 -0400 @@ -191,6 +191,8 @@ enum file_lock_method lock_method); void mail_index_close(struct mail_index *index); +/* Returns TRUE if index is currently in memory. */ +bool mail_index_is_in_memory(struct mail_index *index); /* Move the index into memory. Returns 0 if ok, -1 if error occurred. */ int mail_index_move_to_memory(struct mail_index *index); /* Returns TRUE if index is currently in memory. */
--- a/src/lib-storage/index/maildir/maildir-uidlist.c Mon Apr 13 18:21:24 2009 -0400 +++ b/src/lib-storage/index/maildir/maildir-uidlist.c Mon Apr 13 18:23:37 2009 -0400 @@ -819,10 +819,14 @@ int maildir_uidlist_refresh_fast_init(struct maildir_uidlist *uidlist) { const struct maildir_index_header *mhdr = &uidlist->mbox->maildir_hdr; + struct mail_index *index = uidlist->mbox->ibox.index; + struct mail_index_view *view; const struct mail_index_header *hdr; struct stat st; int ret; + i_assert(UIDLIST_IS_LOCKED(uidlist)); + if (uidlist->fd != -1) return maildir_uidlist_refresh(uidlist); @@ -831,12 +835,17 @@ if (st.st_size == mhdr->uidlist_size && st.st_mtime == (time_t)mhdr->uidlist_mtime && - ST_NTIMES_EQUAL(ST_MTIME_NSEC(st), mhdr->uidlist_mtime_nsecs)) { - /* index is up-to-date */ - hdr = mail_index_get_header(uidlist->mbox->ibox.view); + ST_NTIMES_EQUAL(ST_MTIME_NSEC(st), mhdr->uidlist_mtime_nsecs) && + (!mail_index_is_in_memory(index) || st.st_mtime < ioloop_time-1)) { + /* index is up-to-date. look up the uidvalidity and next-uid + from it. we'll need to create a new view temporarily to + make sure we get the latest values. */ + view = mail_index_view_open(index); + hdr = mail_index_get_header(view); uidlist->uid_validity = hdr->uid_validity; uidlist->next_uid = hdr->next_uid; uidlist->initial_hdr_read = TRUE; + mail_index_view_close(&view); return 1; } else { return maildir_uidlist_refresh(uidlist);