Mercurial > dovecot > original-hg > dovecot-1.2
annotate src/lib-storage/index/maildir/maildir-sync.c @ 5901:3764697932ae HEAD
maildir_filename_get_flags() returns void now.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 08 Jul 2007 21:20:50 +0300 |
| parents | f29b93c0519c |
| children | 62ceb6b2b20d |
| rev | line source |
|---|---|
| 1955 | 1 /* Copyright (C) 2004 Timo Sirainen */ |
| 2 | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
3 /* |
| 1955 | 4 Here's a description of how we handle Maildir synchronization and |
| 5 it's problems: | |
| 6 | |
| 7 We want to be as efficient as we can. The most efficient way to | |
| 3520 | 8 check if changes have occurred is to stat() the new/ and cur/ |
| 1955 | 9 directories and uidlist file - if their mtimes haven't changed, |
| 10 there's no changes and we don't need to do anything. | |
| 11 | |
| 12 Problem 1: Multiple changes can happen within a single second - | |
| 13 nothing guarantees that once we synced it, someone else didn't just | |
| 14 then make a modification. Such modifications wouldn't get noticed | |
| 3520 | 15 until a new modification occurred later. |
| 1955 | 16 |
| 17 Problem 2: Syncing cur/ directory is much more costly than syncing | |
| 18 new/. Moving mails from new/ to cur/ will always change mtime of | |
| 19 cur/ causing us to sync it as well. | |
| 20 | |
| 21 Problem 3: We may not be able to move mail from new/ to cur/ | |
| 22 because we're out of quota, or simply because we're accessing a | |
| 23 read-only mailbox. | |
| 24 | |
| 25 | |
| 26 MAILDIR_SYNC_SECS | |
| 27 ----------------- | |
| 28 | |
| 29 Several checks below use MAILDIR_SYNC_SECS, which should be maximum | |
| 30 clock drift between all computers accessing the maildir (eg. via | |
| 31 NFS), rounded up to next second. Our default is 1 second, since | |
| 32 everyone should be using NTP. | |
| 33 | |
| 34 Note that setting it to 0 works only if there's only one computer | |
| 35 accessing the maildir. It's practically impossible to make two | |
| 36 clocks _exactly_ synchronized. | |
| 37 | |
| 38 It might be possible to only use file server's clock by looking at | |
| 39 the atime field, but I don't know how well that would actually work. | |
| 40 | |
| 41 cur directory | |
| 42 ------------- | |
| 43 | |
| 44 We have dirty_cur_time variable which is set to cur/ directory's | |
| 45 mtime when it's >= time() - MAILDIR_SYNC_SECS and we _think_ we have | |
| 46 synchronized the directory. | |
| 47 | |
| 48 When dirty_cur_time is non-zero, we don't synchronize the cur/ | |
| 49 directory until | |
| 50 | |
| 51 a) cur/'s mtime changes | |
| 52 b) opening a mail fails with ENOENT | |
| 53 c) time() > dirty_cur_time + MAILDIR_SYNC_SECS | |
| 54 | |
| 55 This allows us to modify the maildir multiple times without having | |
| 56 to sync it at every change. The sync will eventually be done to | |
| 57 make sure we didn't miss any external changes. | |
| 58 | |
| 59 The dirty_cur_time is set when: | |
| 60 | |
| 61 - we change message flags | |
| 62 - we expunge messages | |
| 63 - we move mail from new/ to cur/ | |
| 64 - we sync cur/ directory and it's mtime is >= time() - MAILDIR_SYNC_SECS | |
| 65 | |
| 66 It's unset when we do the final syncing, ie. when mtime is | |
| 67 older than time() - MAILDIR_SYNC_SECS. | |
| 68 | |
| 69 new directory | |
| 70 ------------- | |
| 71 | |
| 72 If new/'s mtime is >= time() - MAILDIR_SYNC_SECS, always synchronize | |
| 73 it. dirty_cur_time-like feature might save us a few syncs, but | |
| 74 that might break a client which saves a mail in one connection and | |
| 75 tries to fetch it in another one. new/ directory is almost always | |
| 76 empty, so syncing it should be very fast anyway. Actually this can | |
| 77 still happen if we sync only new/ dir while another client is also | |
| 78 moving mails from it to cur/ - it takes us a while to see them. | |
| 79 That's pretty unlikely to happen however, and only way to fix it | |
| 80 would be to always synchronize cur/ after new/. | |
| 81 | |
| 82 Normally we move all mails from new/ to cur/ whenever we sync it. If | |
| 83 it's not possible for some reason, we mark the mail with "probably | |
| 84 exists in new/ directory" flag. | |
| 85 | |
| 86 If rename() still fails because of ENOSPC or EDQUOT, we still save | |
| 87 the flag changes in index with dirty-flag on. When moving the mail | |
| 88 to cur/ directory, or when we notice it's already moved there, we | |
| 89 apply the flag changes to the filename, rename it and remove the | |
| 90 dirty flag. If there's dirty flags, this should be tried every time | |
| 91 after expunge or when closing the mailbox. | |
| 92 | |
| 93 uidlist | |
| 94 ------- | |
| 95 | |
| 96 This file contains UID <-> filename mappings. It's updated only when | |
| 97 new mail arrives, so it may contain filenames that have already been | |
| 98 deleted. Updating is done by getting uidlist.lock file, writing the | |
| 99 whole uidlist into it and rename()ing it over the old uidlist. This | |
| 100 means there's no need to lock the file for reading. | |
| 101 | |
| 102 Whenever uidlist is rewritten, it's mtime must be larger than the old | |
| 103 one's. Use utime() before rename() if needed. Note that inode checking | |
| 104 wouldn't have been sufficient as inode numbers can be reused. | |
| 105 | |
| 106 This file is usually read the first time you need to know filename for | |
| 107 given UID. After that it's not re-read unless new mails come that we | |
| 108 don't know about. | |
| 109 | |
| 110 broken clients | |
| 111 -------------- | |
| 112 | |
| 113 Originally the middle identifier in Maildir filename was specified | |
| 114 only as <process id>_<delivery counter>. That however created a | |
| 115 problem with randomized PIDs which made it possible that the same | |
| 116 PID was reused within one second. | |
| 117 | |
| 118 So if within one second a mail was delivered, MUA moved it to cur/ | |
| 119 and another mail was delivered by a new process using same PID as | |
| 120 the first one, we likely ended up overwriting the first mail when | |
| 121 the second mail was moved over it. | |
| 122 | |
| 123 Nowadays everyone should be giving a bit more specific identifier, | |
| 124 for example include microseconds in it which Dovecot does. | |
| 125 | |
| 126 There's a simple way to prevent this from happening in some cases: | |
| 127 Don't move the mail from new/ to cur/ if it's mtime is >= time() - | |
| 128 MAILDIR_SYNC_SECS. The second delivery's link() call then fails | |
| 129 because the file is already in new/, and it will then use a | |
| 130 different filename. There's a few problems with this however: | |
| 131 | |
| 132 - it requires extra stat() call which is unneeded extra I/O | |
| 133 - another MUA might still move the mail to cur/ | |
| 134 - if first file's flags are modified by either Dovecot or another | |
| 135 MUA, it's moved to cur/ (you _could_ just do the dirty-flagging | |
| 136 but that'd be ugly) | |
| 137 | |
| 138 Because this is useful only for very few people and it requires | |
| 139 extra I/O, I decided not to implement this. It should be however | |
| 140 quite easy to do since we need to be able to deal with files in new/ | |
| 141 in any case. | |
| 142 | |
| 143 It's also possible to never accidentally overwrite a mail by using | |
| 144 link() + unlink() rather than rename(). This however isn't very | |
| 145 good idea as it introduces potential race conditions when multiple | |
| 146 clients are accessing the mailbox: | |
| 147 | |
| 148 Trying to move the same mail from new/ to cur/ at the same time: | |
| 149 | |
| 150 a) Client 1 uses slightly different filename than client 2, | |
| 151 for example one sets read-flag on but the other doesn't. | |
| 152 You have the same mail duplicated now. | |
| 153 | |
| 154 b) Client 3 sees the mail between Client 1's and 2's link() calls | |
| 155 and changes it's flag. You have the same mail duplicated now. | |
| 156 | |
| 157 And it gets worse when they're unlink()ing in cur/ directory: | |
| 158 | |
| 159 c) Client 1 changes mails's flag and client 2 changes it back | |
| 160 between 1's link() and unlink(). The mail is now expunged. | |
| 161 | |
| 162 d) If you try to deal with the duplicates by unlink()ing another | |
| 163 one of them, you might end up unlinking both of them. | |
| 164 | |
| 165 So, what should we do then if we notice a duplicate? First of all, | |
| 166 it might not be a duplicate at all, readdir() might have just | |
| 167 returned it twice because it was just renamed. What we should do is | |
| 168 create a completely new base name for it and rename() it to that. | |
| 169 If the call fails with ENOENT, it only means that it wasn't a | |
| 170 duplicate after all. | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
171 */ |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
172 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
173 #include "lib.h" |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
174 #include "ioloop.h" |
|
3470
346a494c2feb
Moved array declaration to array-decl.h and include it in lib.h. So array.h
Timo Sirainen <tss@iki.fi>
parents:
3453
diff
changeset
|
175 #include "array.h" |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
176 #include "buffer.h" |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
177 #include "hash.h" |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
178 #include "str.h" |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
179 #include "maildir-storage.h" |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
180 #include "maildir-uidlist.h" |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
181 #include "maildir-keywords.h" |
|
5899
f29b93c0519c
Moved maildir filename related functions to maildir-filename.c
Timo Sirainen <tss@iki.fi>
parents:
5850
diff
changeset
|
182 #include "maildir-filename.h" |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
183 #include "maildir-sync.h" |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
184 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
185 #include <stdio.h> |
|
2050
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
186 #include <stddef.h> |
|
5588
6c89106dee21
Keyword characters weren't sorted in the maildir filename.
Timo Sirainen <tss@iki.fi>
parents:
5582
diff
changeset
|
187 #include <stdlib.h> |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
188 #include <unistd.h> |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
189 #include <dirent.h> |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
190 #include <sys/stat.h> |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
191 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
192 #define MAILDIR_FILENAME_FLAG_FOUND 128 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
193 |
|
3435
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
194 /* When rename()ing many files from new/ to cur/, it's possible that next |
|
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
195 readdir() skips some files. we don't of course wish to lose them, so we |
|
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
196 go and rescan the new/ directory again from beginning until no files are |
|
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
197 left. This value is just an optimization to avoid checking the directory |
|
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
198 twice unneededly. usually only NFS is the problem case. 1 is the safest |
|
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
199 bet here, but I guess 5 will do just fine too. */ |
|
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
200 #define MAILDIR_RENAME_RESCAN_COUNT 5 |
|
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
201 |
|
5214
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
202 /* After moving 100 mails from new/ to cur/, check if we need to touch the |
|
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
203 uidlist lock. */ |
|
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
204 #define MAILDIR_SLOW_MOVE_COUNT 100 |
|
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
205 /* readdir() should be pretty fast to do, but check anyway every 10000 mails |
|
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
206 to see if we need to touch the uidlist lock. */ |
|
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
207 #define MAILDIR_SLOW_CHECK_COUNT 10000 |
|
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
208 |
|
5397
3a0964ac3a5c
comment/duplicate link handling fixes.
Timo Sirainen <tss@iki.fi>
parents:
5392
diff
changeset
|
209 /* This is mostly to avoid infinite looping when rename() destination already |
|
3a0964ac3a5c
comment/duplicate link handling fixes.
Timo Sirainen <tss@iki.fi>
parents:
5392
diff
changeset
|
210 exists as the hard link of the file itself. */ |
|
5391
0c8705aad54c
Avoid infinite looping when buggy filesystems.
Timo Sirainen <tss@iki.fi>
parents:
5390
diff
changeset
|
211 #define MAILDIR_SCAN_DIR_MAX_COUNT 5 |
|
0c8705aad54c
Avoid infinite looping when buggy filesystems.
Timo Sirainen <tss@iki.fi>
parents:
5390
diff
changeset
|
212 |
|
5443
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
213 #define DUPE_LINKS_DELETE_SECS 30 |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
214 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
215 struct maildir_sync_context { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
216 struct maildir_mailbox *mbox; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
217 const char *new_dir, *cur_dir; |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
218 bool partial; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
219 |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
220 unsigned int move_count, check_count; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
221 time_t last_touch, last_notify; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
222 |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
223 struct maildir_uidlist_sync_ctx *uidlist_sync_ctx; |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
224 struct maildir_index_sync_context *index_sync_ctx; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
225 }; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
226 |
|
1956
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
227 struct maildir_index_sync_context { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
228 struct maildir_mailbox *mbox; |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
229 struct maildir_sync_context *maildir_sync_ctx; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
230 |
|
2037
8763032d31bd
Set dirty flags through transaction log, not directly. Some other flag
Timo Sirainen <tss@iki.fi>
parents:
2034
diff
changeset
|
231 struct mail_index_view *view; |
|
1956
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
232 struct mail_index_sync_ctx *sync_ctx; |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
233 struct maildir_keywords_sync_ctx *keywords_sync_ctx; |
|
2037
8763032d31bd
Set dirty flags through transaction log, not directly. Some other flag
Timo Sirainen <tss@iki.fi>
parents:
2034
diff
changeset
|
234 struct mail_index_transaction *trans; |
|
1956
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
235 |
|
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4450
diff
changeset
|
236 ARRAY_DEFINE(sync_recs, struct mail_index_sync_rec); |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
237 uint32_t seq, uid; |
|
2272
ced88553af0b
mail_index_sync_sort_flags() now merges flag changes so mail storage
Timo Sirainen <tss@iki.fi>
parents:
2258
diff
changeset
|
238 int dirty_state; |
|
1956
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
239 }; |
|
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
240 |
|
3775
8321e6191275
maildir_copy_with_hardlinks works again.
Timo Sirainen <tss@iki.fi>
parents:
3583
diff
changeset
|
241 struct maildir_keywords_sync_ctx * |
|
8321e6191275
maildir_copy_with_hardlinks works again.
Timo Sirainen <tss@iki.fi>
parents:
3583
diff
changeset
|
242 maildir_sync_get_keywords_sync_ctx(struct maildir_index_sync_context *ctx) |
|
8321e6191275
maildir_copy_with_hardlinks works again.
Timo Sirainen <tss@iki.fi>
parents:
3583
diff
changeset
|
243 { |
|
8321e6191275
maildir_copy_with_hardlinks works again.
Timo Sirainen <tss@iki.fi>
parents:
3583
diff
changeset
|
244 return ctx->keywords_sync_ctx; |
|
8321e6191275
maildir_copy_with_hardlinks works again.
Timo Sirainen <tss@iki.fi>
parents:
3583
diff
changeset
|
245 } |
|
8321e6191275
maildir_copy_with_hardlinks works again.
Timo Sirainen <tss@iki.fi>
parents:
3583
diff
changeset
|
246 |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
247 static int maildir_expunge(struct maildir_mailbox *mbox, const char *path, |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
248 struct maildir_index_sync_context *ctx) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
249 { |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
250 struct mailbox *box = &mbox->ibox.box; |
|
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
251 |
| 1955 | 252 if (unlink(path) == 0) { |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
253 if (box->v.sync_notify != NULL) { |
|
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
254 box->v.sync_notify(box, ctx->uid, |
|
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
255 MAILBOX_SYNC_TYPE_EXPUNGE); |
|
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
256 } |
|
5743
1fa32e040ea5
Treat non-external expunges as requests for expunging messages. If it's
Timo Sirainen <tss@iki.fi>
parents:
5708
diff
changeset
|
257 mail_index_expunge(ctx->trans, ctx->seq); |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
258 mbox->dirty_cur_time = ioloop_time; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
259 return 1; |
| 1955 | 260 } |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
261 if (errno == ENOENT) |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
262 return 0; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
263 |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
264 mail_storage_set_critical(&mbox->storage->storage, |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
265 "unlink(%s) failed: %m", path); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
266 return -1; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
267 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
268 |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
269 static int maildir_sync_flags(struct maildir_mailbox *mbox, const char *path, |
|
4907
5b4c9b20eba0
Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents:
4894
diff
changeset
|
270 struct maildir_index_sync_context *ctx) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
271 { |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
272 struct mailbox *box = &mbox->ibox.box; |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
273 const struct mail_index_sync_rec *recs; |
|
4450
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
274 const char *dir, *fname, *newfname, *newpath; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
275 enum mail_flags flags; |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
276 enum mailbox_sync_type sync_type = 0; |
|
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4450
diff
changeset
|
277 ARRAY_TYPE(keyword_indexes) keywords; |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
278 unsigned int i, count; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
279 uint8_t flags8; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
280 |
|
2272
ced88553af0b
mail_index_sync_sort_flags() now merges flag changes so mail storage
Timo Sirainen <tss@iki.fi>
parents:
2258
diff
changeset
|
281 ctx->dirty_state = 0; |
|
2037
8763032d31bd
Set dirty flags through transaction log, not directly. Some other flag
Timo Sirainen <tss@iki.fi>
parents:
2034
diff
changeset
|
282 |
|
4450
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
283 fname = strrchr(path, '/'); |
|
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
284 i_assert(fname != NULL); |
|
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
285 fname++; |
|
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
286 dir = t_strdup_until(path, fname); |
|
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
287 |
|
4596
bf4e98a0de3f
Replaced ARRAY_CREATE() macro with [ipt]_array_init() macros. The macro
Timo Sirainen <tss@iki.fi>
parents:
4594
diff
changeset
|
288 t_array_init(&keywords, 16); |
|
5901
3764697932ae
maildir_filename_get_flags() returns void now.
Timo Sirainen <tss@iki.fi>
parents:
5899
diff
changeset
|
289 maildir_filename_get_flags(ctx->keywords_sync_ctx, |
|
3764697932ae
maildir_filename_get_flags() returns void now.
Timo Sirainen <tss@iki.fi>
parents:
5899
diff
changeset
|
290 fname, &flags, &keywords); |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
291 flags8 = flags; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
292 |
|
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4450
diff
changeset
|
293 recs = array_get_modifiable(&ctx->sync_recs, &count); |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
294 for (i = 0; i < count; i++) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
295 if (recs[i].uid1 != ctx->seq) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
296 break; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
297 |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
298 switch (recs[i].type) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
299 case MAIL_INDEX_SYNC_TYPE_FLAGS: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
300 mail_index_sync_flags_apply(&recs[i], &flags8); |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
301 sync_type |= MAILBOX_SYNC_TYPE_FLAGS; |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
302 break; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
303 case MAIL_INDEX_SYNC_TYPE_KEYWORD_ADD: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
304 case MAIL_INDEX_SYNC_TYPE_KEYWORD_REMOVE: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
305 case MAIL_INDEX_SYNC_TYPE_KEYWORD_RESET: |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
306 mail_index_sync_keywords_apply(&recs[i], &keywords); |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
307 sync_type |= MAILBOX_SYNC_TYPE_KEYWORDS; |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
308 break; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
309 case MAIL_INDEX_SYNC_TYPE_APPEND: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
310 case MAIL_INDEX_SYNC_TYPE_EXPUNGE: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
311 i_unreached(); |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
312 break; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
313 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
314 } |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
315 i_assert(sync_type != 0); |
|
4450
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
316 |
|
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
317 newfname = maildir_filename_set_flags(ctx->keywords_sync_ctx, |
|
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
318 fname, flags8, &keywords); |
|
14b10f7ea70e
Don't break if mailbox path contains ':' characters.
Timo Sirainen <tss@iki.fi>
parents:
4397
diff
changeset
|
319 newpath = t_strconcat(dir, newfname, NULL); |
| 1955 | 320 if (rename(path, newpath) == 0) { |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
321 if (box->v.sync_notify != NULL) |
|
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
322 box->v.sync_notify(box, ctx->uid, sync_type); |
|
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
323 |
|
2272
ced88553af0b
mail_index_sync_sort_flags() now merges flag changes so mail storage
Timo Sirainen <tss@iki.fi>
parents:
2258
diff
changeset
|
324 if ((flags8 & MAIL_INDEX_MAIL_FLAG_DIRTY) != 0) |
|
ced88553af0b
mail_index_sync_sort_flags() now merges flag changes so mail storage
Timo Sirainen <tss@iki.fi>
parents:
2258
diff
changeset
|
325 ctx->dirty_state = -1; |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
326 mbox->dirty_cur_time = ioloop_time; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
327 return 1; |
| 1955 | 328 } |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
329 if (errno == ENOENT) |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
330 return 0; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
331 |
|
2037
8763032d31bd
Set dirty flags through transaction log, not directly. Some other flag
Timo Sirainen <tss@iki.fi>
parents:
2034
diff
changeset
|
332 if (ENOSPACE(errno) || errno == EACCES) { |
|
8763032d31bd
Set dirty flags through transaction log, not directly. Some other flag
Timo Sirainen <tss@iki.fi>
parents:
2034
diff
changeset
|
333 mail_index_update_flags(ctx->trans, ctx->seq, MODIFY_ADD, |
|
5307
1e2b2b3f18e3
Added casts to some enums to avoid compiler warnings.
Timo Sirainen <tss@iki.fi>
parents:
5229
diff
changeset
|
334 (enum mail_flags)MAIL_INDEX_MAIL_FLAG_DIRTY); |
|
2272
ced88553af0b
mail_index_sync_sort_flags() now merges flag changes so mail storage
Timo Sirainen <tss@iki.fi>
parents:
2258
diff
changeset
|
335 ctx->dirty_state = 1; |
|
1956
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
336 return 1; |
|
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
337 } |
|
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
338 |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
339 mail_storage_set_critical(&mbox->storage->storage, |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
340 "rename(%s, %s) failed: %m", path, newpath); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
341 return -1; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
342 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
343 |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
344 static void |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
345 maildir_sync_check_timeouts(struct maildir_sync_context *ctx, bool move) |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
346 { |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
347 time_t now; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
348 |
|
5390
4eeec560df01
If saving to maildir causes flag/expunge syncs, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
5388
diff
changeset
|
349 if (ctx == NULL) { |
|
4eeec560df01
If saving to maildir causes flag/expunge syncs, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
5388
diff
changeset
|
350 /* we got here from maildir-save.c. it has no |
|
4eeec560df01
If saving to maildir causes flag/expunge syncs, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
5388
diff
changeset
|
351 maildir_sync_context, */ |
|
4eeec560df01
If saving to maildir causes flag/expunge syncs, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
5388
diff
changeset
|
352 return; |
|
4eeec560df01
If saving to maildir causes flag/expunge syncs, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
5388
diff
changeset
|
353 } |
|
4eeec560df01
If saving to maildir causes flag/expunge syncs, don't crash.
Timo Sirainen <tss@iki.fi>
parents:
5388
diff
changeset
|
354 |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
355 if (move) { |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
356 ctx->move_count++; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
357 if ((ctx->move_count % MAILDIR_SLOW_MOVE_COUNT) != 0) |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
358 return; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
359 } else { |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
360 ctx->check_count++; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
361 if ((ctx->check_count % MAILDIR_SLOW_CHECK_COUNT) != 0) |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
362 return; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
363 } |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
364 |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
365 now = time(NULL); |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
366 if (now - ctx->last_touch > MAILDIR_LOCK_TOUCH_SECS) { |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
367 (void)maildir_uidlist_lock_touch(ctx->mbox->uidlist); |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
368 ctx->last_touch = now; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
369 } |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
370 if (now - ctx->last_notify > MAIL_STORAGE_STAYALIVE_SECS) { |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
371 struct mailbox *box = &ctx->mbox->ibox.box; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
372 |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
373 if (box->storage->callbacks->notify_ok != NULL) { |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
374 box->storage->callbacks-> |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
375 notify_ok(box, "Hang in there..", |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
376 box->storage->callback_context); |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
377 } |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
378 ctx->last_notify = now; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
379 } |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
380 } |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
381 |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
382 static int |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
383 maildir_sync_record_commit_until(struct maildir_index_sync_context *ctx, |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
384 uint32_t last_seq) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
385 { |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
386 struct mail_index_sync_rec *recs; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
387 unsigned int i, count; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
388 uint32_t seq, uid; |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
389 bool expunged, flag_changed; |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
390 |
|
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4450
diff
changeset
|
391 recs = array_get_modifiable(&ctx->sync_recs, &count); |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
392 for (seq = recs[0].uid1; seq <= last_seq; seq++) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
393 expunged = flag_changed = FALSE; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
394 for (i = 0; i < count; i++) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
395 if (recs[i].uid1 > seq) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
396 break; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
397 |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
398 i_assert(recs[i].uid1 == seq); |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
399 switch (recs[i].type) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
400 case MAIL_INDEX_SYNC_TYPE_EXPUNGE: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
401 expunged = TRUE; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
402 break; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
403 case MAIL_INDEX_SYNC_TYPE_FLAGS: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
404 case MAIL_INDEX_SYNC_TYPE_KEYWORD_ADD: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
405 case MAIL_INDEX_SYNC_TYPE_KEYWORD_REMOVE: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
406 case MAIL_INDEX_SYNC_TYPE_KEYWORD_RESET: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
407 flag_changed = TRUE; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
408 break; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
409 case MAIL_INDEX_SYNC_TYPE_APPEND: |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
410 i_unreached(); |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
411 break; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
412 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
413 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
414 |
| 5080 | 415 if (mail_index_lookup_uid(ctx->view, seq, &uid) < 0) { |
| 416 mail_storage_set_index_error(&ctx->mbox->ibox); | |
|
2033
4f6b1118a53d
Transaction log contains only UIDs now, no more sequences which just mess up
Timo Sirainen <tss@iki.fi>
parents:
2009
diff
changeset
|
417 return -1; |
| 5080 | 418 } |
|
2033
4f6b1118a53d
Transaction log contains only UIDs now, no more sequences which just mess up
Timo Sirainen <tss@iki.fi>
parents:
2009
diff
changeset
|
419 |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
420 ctx->seq = seq; |
|
5562
24b751bc0995
Added sync_notify() callback to struct mail_storage. It's now called for
Timo Sirainen <tss@iki.fi>
parents:
5459
diff
changeset
|
421 ctx->uid = uid; |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
422 if (expunged) { |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
423 maildir_sync_check_timeouts(ctx->maildir_sync_ctx, |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
424 TRUE); |
|
5743
1fa32e040ea5
Treat non-external expunges as requests for expunging messages. If it's
Timo Sirainen <tss@iki.fi>
parents:
5708
diff
changeset
|
425 (void)maildir_file_do(ctx->mbox, uid, |
|
1fa32e040ea5
Treat non-external expunges as requests for expunging messages. If it's
Timo Sirainen <tss@iki.fi>
parents:
5708
diff
changeset
|
426 maildir_expunge, ctx); |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
427 } else if (flag_changed) { |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
428 maildir_sync_check_timeouts(ctx->maildir_sync_ctx, |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
429 TRUE); |
|
5743
1fa32e040ea5
Treat non-external expunges as requests for expunging messages. If it's
Timo Sirainen <tss@iki.fi>
parents:
5708
diff
changeset
|
430 (void)maildir_file_do(ctx->mbox, uid, |
|
1fa32e040ea5
Treat non-external expunges as requests for expunging messages. If it's
Timo Sirainen <tss@iki.fi>
parents:
5708
diff
changeset
|
431 maildir_sync_flags, ctx); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
432 } |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
433 |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
434 for (i = count; i > 0; i--) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
435 if (++recs[i-1].uid1 > recs[i-1].uid2) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
436 array_delete(&ctx->sync_recs, i-1, 1); |
|
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4450
diff
changeset
|
437 recs = array_get_modifiable(&ctx->sync_recs, |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
438 &count); |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
439 if (count == 0) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
440 /* all sync_recs committed */ |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
441 return 0; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
442 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
443 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
444 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
445 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
446 return 0; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
447 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
448 |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
449 static int maildir_sync_record(struct maildir_index_sync_context *ctx, |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
450 const struct mail_index_sync_rec *sync_rec) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
451 { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
452 struct mail_index_view *view = ctx->view; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
453 struct mail_index_sync_rec sync_copy; |
|
2033
4f6b1118a53d
Transaction log contains only UIDs now, no more sequences which just mess up
Timo Sirainen <tss@iki.fi>
parents:
2009
diff
changeset
|
454 |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
455 if (sync_rec == NULL) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
456 /* deinit */ |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
457 while (array_count(&ctx->sync_recs) > 0) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
458 if (maildir_sync_record_commit_until(ctx, |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
459 (uint32_t)-1) < 0) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
460 return -1; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
461 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
462 return 0; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
463 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
464 |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
465 if (sync_rec->type == MAIL_INDEX_SYNC_TYPE_APPEND) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
466 return 0; /* ignore */ |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
467 |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
468 /* convert to sequences to avoid looping through huge holes in |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
469 UID range */ |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
470 sync_copy = *sync_rec; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
471 if (mail_index_lookup_uid_range(view, sync_rec->uid1, |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
472 sync_rec->uid2, |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
473 &sync_copy.uid1, |
| 5080 | 474 &sync_copy.uid2) < 0) { |
| 475 mail_storage_set_index_error(&ctx->mbox->ibox); | |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
476 return -1; |
| 5080 | 477 } |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
478 |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
479 if (sync_copy.uid1 == 0) { |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
480 /* UIDs were expunged */ |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
481 return 0; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
482 } |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
483 |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
484 while (array_count(&ctx->sync_recs) > 0) { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
485 const struct mail_index_sync_rec *rec = |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
486 array_idx(&ctx->sync_recs, 0); |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
487 |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
488 i_assert(rec->uid1 <= sync_copy.uid1); |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
489 if (rec->uid1 == sync_copy.uid1) |
|
2033
4f6b1118a53d
Transaction log contains only UIDs now, no more sequences which just mess up
Timo Sirainen <tss@iki.fi>
parents:
2009
diff
changeset
|
490 break; |
|
4f6b1118a53d
Transaction log contains only UIDs now, no more sequences which just mess up
Timo Sirainen <tss@iki.fi>
parents:
2009
diff
changeset
|
491 |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
492 if (maildir_sync_record_commit_until(ctx, sync_copy.uid1-1) < 0) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
493 return -1; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
494 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
495 |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
496 array_append(&ctx->sync_recs, &sync_copy, 1); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
497 return 0; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
498 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
499 |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
500 static int maildir_sync_index_records(struct maildir_index_sync_context *ctx) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
501 { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
502 struct mail_index_sync_rec sync_rec; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
503 int ret; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
504 |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
505 ret = mail_index_sync_next(ctx->sync_ctx, &sync_rec); |
| 5080 | 506 if (ret <= 0) { |
| 507 if (ret < 0) | |
| 508 mail_storage_set_index_error(&ctx->mbox->ibox); | |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
509 return ret; |
| 5080 | 510 } |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
511 |
|
4596
bf4e98a0de3f
Replaced ARRAY_CREATE() macro with [ipt]_array_init() macros. The macro
Timo Sirainen <tss@iki.fi>
parents:
4594
diff
changeset
|
512 t_array_init(&ctx->sync_recs, 32); |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
513 do { |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
514 if (maildir_sync_record(ctx, &sync_rec) < 0) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
515 return -1; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
516 |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
517 ret = mail_index_sync_next(ctx->sync_ctx, &sync_rec); |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
518 } while (ret > 0); |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
519 |
| 5080 | 520 if (ret < 0) |
| 521 mail_storage_set_index_error(&ctx->mbox->ibox); | |
| 522 | |
|
3446
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
523 if (maildir_sync_record(ctx, NULL) < 0) |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
524 return -1; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
525 return ret; |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
526 } |
|
113c888cdca1
Merge changes from multiple index sync records into one before actually
Timo Sirainen <tss@iki.fi>
parents:
3436
diff
changeset
|
527 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
528 static struct maildir_sync_context * |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
529 maildir_sync_context_new(struct maildir_mailbox *mbox) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
530 { |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
531 struct maildir_sync_context *ctx; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
532 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
533 ctx = t_new(struct maildir_sync_context, 1); |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
534 ctx->mbox = mbox; |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
535 ctx->new_dir = t_strconcat(mbox->path, "/new", NULL); |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
536 ctx->cur_dir = t_strconcat(mbox->path, "/cur", NULL); |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
537 ctx->last_touch = ioloop_time; |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
538 ctx->last_notify = ioloop_time; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
539 return ctx; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
540 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
541 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
542 static void maildir_sync_deinit(struct maildir_sync_context *ctx) |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
543 { |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
544 if (ctx->uidlist_sync_ctx != NULL) |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
545 (void)maildir_uidlist_sync_deinit(&ctx->uidlist_sync_ctx); |
|
4774
615b7738a62f
Saving mails could have skipped over transactions, which caused different
Timo Sirainen <tss@iki.fi>
parents:
4612
diff
changeset
|
546 if (ctx->index_sync_ctx != NULL) { |
|
615b7738a62f
Saving mails could have skipped over transactions, which caused different
Timo Sirainen <tss@iki.fi>
parents:
4612
diff
changeset
|
547 (void)maildir_sync_index_finish(&ctx->index_sync_ctx, |
|
615b7738a62f
Saving mails could have skipped over transactions, which caused different
Timo Sirainen <tss@iki.fi>
parents:
4612
diff
changeset
|
548 TRUE, FALSE); |
|
615b7738a62f
Saving mails could have skipped over transactions, which caused different
Timo Sirainen <tss@iki.fi>
parents:
4612
diff
changeset
|
549 } |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
550 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
551 |
|
4397
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
552 static int maildir_fix_duplicate(struct maildir_sync_context *ctx, |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
553 const char *dir, const char *old_fname) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
554 { |
|
4397
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
555 struct maildir_mailbox *mbox = ctx->mbox; |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
556 const char *existing_fname, *existing_path; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
557 const char *new_fname, *old_path, *new_path; |
|
5397
3a0964ac3a5c
comment/duplicate link handling fixes.
Timo Sirainen <tss@iki.fi>
parents:
5392
diff
changeset
|
558 struct stat ex_st, old_st; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
559 int ret = 0; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
560 |
|
4397
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
561 existing_fname = |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
562 maildir_uidlist_sync_get_full_filename(ctx->uidlist_sync_ctx, |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
563 old_fname); |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
564 i_assert(existing_fname != NULL); |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
565 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
566 t_push(); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
567 |
|
4397
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
568 existing_path = t_strconcat(dir, "/", existing_fname, NULL); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
569 old_path = t_strconcat(dir, "/", old_fname, NULL); |
|
4397
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
570 |
|
5392
9a8402768b42
If duplicate links are found, rename() one over the other to get rid of
Timo Sirainen <tss@iki.fi>
parents:
5391
diff
changeset
|
571 if (stat(existing_path, &ex_st) < 0 || |
|
9a8402768b42
If duplicate links are found, rename() one over the other to get rid of
Timo Sirainen <tss@iki.fi>
parents:
5391
diff
changeset
|
572 stat(old_path, &old_st) < 0) { |
|
4397
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
573 /* most likely the files just don't exist anymore. |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
574 don't really care about other errors much. */ |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
575 t_pop(); |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
576 return 0; |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
577 } |
|
5392
9a8402768b42
If duplicate links are found, rename() one over the other to get rid of
Timo Sirainen <tss@iki.fi>
parents:
5391
diff
changeset
|
578 if (ex_st.st_ino == old_st.st_ino && |
|
9a8402768b42
If duplicate links are found, rename() one over the other to get rid of
Timo Sirainen <tss@iki.fi>
parents:
5391
diff
changeset
|
579 CMP_DEV_T(ex_st.st_dev, old_st.st_dev)) { |
|
5397
3a0964ac3a5c
comment/duplicate link handling fixes.
Timo Sirainen <tss@iki.fi>
parents:
5392
diff
changeset
|
580 /* Files are the same. this means either a race condition |
|
5443
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
581 between stat() calls, or that the files were link()ed. */ |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
582 if (ex_st.st_nlink > 1 && old_st.st_nlink == ex_st.st_nlink && |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
583 ex_st.st_ctime == old_st.st_ctime && |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
584 ex_st.st_ctime < ioloop_time - DUPE_LINKS_DELETE_SECS) { |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
585 /* The file has hard links and it hasn't had any |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
586 changes (such as renames) for a while, so this |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
587 isn't a race condition. |
|
5392
9a8402768b42
If duplicate links are found, rename() one over the other to get rid of
Timo Sirainen <tss@iki.fi>
parents:
5391
diff
changeset
|
588 |
|
5443
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
589 rename()ing one file on top of the other would fix |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
590 this safely, except POSIX decided that rename() |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
591 doesn't work that way. So we'll have unlink() one |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
592 and hope that another process didn't just decide to |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
593 unlink() the other (uidlist lock prevents this from |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
594 happening) */ |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
595 if (unlink(old_path) == 0) { |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
596 i_warning("Unlinked a duplicate: %s", |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
597 old_fname); |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
598 } else { |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
599 mail_storage_set_critical( |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
600 &mbox->storage->storage, |
|
5443
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
601 "unlink(%s) failed: %m", old_path); |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
602 } |
|
293bc7d1062f
If we find duplicate hard links which haven't changed for 30 secs, unlink()
Timo Sirainen <tss@iki.fi>
parents:
5397
diff
changeset
|
603 } |
|
4397
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
604 t_pop(); |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
605 return 0; |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
606 } |
|
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
607 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
608 new_fname = maildir_generate_tmp_filename(&ioloop_timeval); |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
609 new_path = t_strconcat(mbox->path, "/new/", new_fname, NULL); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
610 |
|
5392
9a8402768b42
If duplicate links are found, rename() one over the other to get rid of
Timo Sirainen <tss@iki.fi>
parents:
5391
diff
changeset
|
611 if (rename(old_path, new_path) == 0) |
|
9a8402768b42
If duplicate links are found, rename() one over the other to get rid of
Timo Sirainen <tss@iki.fi>
parents:
5391
diff
changeset
|
612 i_warning("Fixed a duplicate: %s -> %s", old_fname, new_fname); |
|
9a8402768b42
If duplicate links are found, rename() one over the other to get rid of
Timo Sirainen <tss@iki.fi>
parents:
5391
diff
changeset
|
613 else if (errno != ENOENT) { |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
614 mail_storage_set_critical(&mbox->storage->storage, |
| 5582 | 615 "Couldn't fix a duplicate: rename(%s, %s) failed: %m", |
| 616 old_path, new_path); | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
617 ret = -1; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
618 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
619 t_pop(); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
620 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
621 return ret; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
622 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
623 |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
624 static int maildir_scan_dir(struct maildir_sync_context *ctx, bool new_dir) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
625 { |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
626 struct mail_storage *storage = &ctx->mbox->storage->storage; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
627 const char *dir; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
628 DIR *dirp; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
629 string_t *src, *dest; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
630 struct dirent *dp; |
|
3435
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
631 enum maildir_uidlist_rec_flag flags; |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
632 int ret = 1; |
|
5214
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
633 bool move_new, check_touch; |
|
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
634 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
635 dir = new_dir ? ctx->new_dir : ctx->cur_dir; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
636 dirp = opendir(dir); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
637 if (dirp == NULL) { |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
638 mail_storage_set_critical(storage, |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
639 "opendir(%s) failed: %m", dir); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
640 return -1; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
641 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
642 |
| 2121 | 643 t_push(); |
| 644 src = t_str_new(1024); | |
| 645 dest = t_str_new(1024); | |
| 646 | |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
647 ctx->move_count = 0; |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
648 move_new = new_dir && !mailbox_is_readonly(&ctx->mbox->ibox.box) && |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
649 !ctx->mbox->ibox.keep_recent; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
650 while ((dp = readdir(dirp)) != NULL) { |
|
2258
087a43e29492
No maildir filename checking after all.
Timo Sirainen <tss@iki.fi>
parents:
2256
diff
changeset
|
651 if (dp->d_name[0] == '.') |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
652 continue; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
653 |
|
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1970
diff
changeset
|
654 ret = maildir_uidlist_sync_next_pre(ctx->uidlist_sync_ctx, |
|
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1970
diff
changeset
|
655 dp->d_name); |
| 1984 | 656 if (ret == 0) { |
|
2038
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
657 /* new file and we couldn't lock uidlist, check this |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
658 later in next sync. */ |
| 1984 | 659 if (new_dir) |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
660 ctx->mbox->last_new_mtime = 0; |
| 1984 | 661 else |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
662 ctx->mbox->dirty_cur_time = ioloop_time; |
|
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1970
diff
changeset
|
663 continue; |
| 1984 | 664 } |
|
1978
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1970
diff
changeset
|
665 if (ret < 0) |
|
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1970
diff
changeset
|
666 break; |
|
6303ef092c5b
mbox code compiles again, but syncing is only partially implemented so
Timo Sirainen <tss@iki.fi>
parents:
1970
diff
changeset
|
667 |
|
5214
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
668 check_touch = FALSE; |
| 1947 | 669 flags = 0; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
670 if (move_new) { |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
671 str_truncate(src, 0); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
672 str_truncate(dest, 0); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
673 str_printfa(src, "%s/%s", ctx->new_dir, dp->d_name); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
674 str_printfa(dest, "%s/%s", ctx->cur_dir, dp->d_name); |
|
3417
b0bdf32564b7
Replaced ':' and ',' character usages with #defines, so they can be changed
Timo Sirainen <tss@iki.fi>
parents:
3340
diff
changeset
|
675 if (strchr(dp->d_name, MAILDIR_INFO_SEP) == NULL) { |
|
b0bdf32564b7
Replaced ':' and ',' character usages with #defines, so they can be changed
Timo Sirainen <tss@iki.fi>
parents:
3340
diff
changeset
|
676 str_append(dest, MAILDIR_FLAGS_FULL_SEP); |
|
b0bdf32564b7
Replaced ':' and ',' character usages with #defines, so they can be changed
Timo Sirainen <tss@iki.fi>
parents:
3340
diff
changeset
|
677 } |
| 1947 | 678 if (rename(str_c(src), str_c(dest)) == 0) { |
| 1984 | 679 /* we moved it - it's \Recent for us */ |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
680 maildir_sync_check_timeouts(ctx, TRUE); |
|
3435
6f7ce690358e
If we have rename()d more than 5 files from new/ to cur/, rescan the
Timo Sirainen <tss@iki.fi>
parents:
3417
diff
changeset
|
681 ctx->mbox->dirty_cur_time = ioloop_time; |
| 1947 | 682 flags |= MAILDIR_UIDLIST_REC_FLAG_MOVED | |
| 683 MAILDIR_UIDLIST_REC_FLAG_RECENT; | |
| 684 } else if (ENOTFOUND(errno)) { | |
| 685 /* someone else moved it already */ | |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
686 maildir_sync_check_timeouts(ctx, TRUE); |
| 1947 | 687 flags |= MAILDIR_UIDLIST_REC_FLAG_MOVED; |
|
4199
fa135b615b01
If maildir is readonly, don't complain about rename() failing to move mails
Timo Sirainen <tss@iki.fi>
parents:
4152
diff
changeset
|
688 } else if (ENOSPACE(errno) || errno == EACCES) { |
|
fa135b615b01
If maildir is readonly, don't complain about rename() failing to move mails
Timo Sirainen <tss@iki.fi>
parents:
4152
diff
changeset
|
689 /* not enough disk space / read-only maildir, |
|
fa135b615b01
If maildir is readonly, don't complain about rename() failing to move mails
Timo Sirainen <tss@iki.fi>
parents:
4152
diff
changeset
|
690 leave here */ |
| 1947 | 691 flags |= MAILDIR_UIDLIST_REC_FLAG_NEW_DIR | |
| 692 MAILDIR_UIDLIST_REC_FLAG_RECENT; | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
693 move_new = FALSE; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
694 } else { |
| 1947 | 695 flags |= MAILDIR_UIDLIST_REC_FLAG_NEW_DIR | |
| 696 MAILDIR_UIDLIST_REC_FLAG_RECENT; | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
697 mail_storage_set_critical(storage, |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
698 "rename(%s, %s) failed: %m", |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
699 str_c(src), str_c(dest)); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
700 } |
| 1947 | 701 } else if (new_dir) { |
| 702 flags |= MAILDIR_UIDLIST_REC_FLAG_NEW_DIR | | |
| 703 MAILDIR_UIDLIST_REC_FLAG_RECENT; | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
704 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
705 |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
706 maildir_sync_check_timeouts(ctx, FALSE); |
|
5214
4e9d345df846
When syncing huge maildirs check once in a while if we need to update
Timo Sirainen <tss@iki.fi>
parents:
5080
diff
changeset
|
707 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
708 ret = maildir_uidlist_sync_next(ctx->uidlist_sync_ctx, |
| 1947 | 709 dp->d_name, flags); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
710 if (ret <= 0) { |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
711 if (ret < 0) |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
712 break; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
713 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
714 /* possibly duplicate - try fixing it */ |
|
4397
5cbabd4ccd9c
Don't go fixing duplicate maildir filenames without properly checking that
Timo Sirainen <tss@iki.fi>
parents:
4238
diff
changeset
|
715 if (maildir_fix_duplicate(ctx, dir, dp->d_name) < 0) { |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
716 ret = -1; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
717 break; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
718 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
719 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
720 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
721 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
722 if (closedir(dirp) < 0) { |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
723 mail_storage_set_critical(storage, |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
724 "closedir(%s) failed: %m", dir); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
725 } |
| 2121 | 726 |
| 727 t_pop(); | |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
728 return ret < 0 ? -1 : |
|
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
729 (ctx->move_count <= MAILDIR_RENAME_RESCAN_COUNT ? 0 : 1); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
730 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
731 |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
732 static void |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
733 maildir_sync_update_from_header(struct maildir_mailbox *mbox, |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
734 struct mail_index_header *hdr_r) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
735 { |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
736 struct mail_index_view *view; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
737 const struct mail_index_header *hdr; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
738 |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
739 /* open a new view so we get the latest header */ |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
740 view = mail_index_view_open(mbox->ibox.index); |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
741 hdr = mail_index_get_header(view); |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
742 |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
743 /* FIXME: ugly, replace with extension header */ |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
744 mbox->last_new_mtime = hdr->sync_size & 0xffffffff; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
745 mbox->last_dirty_flags = (hdr->sync_size >> 32) & |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
746 (MAILDIR_DIRTY_NEW | MAILDIR_DIRTY_CUR); |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
747 |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
748 mbox->last_cur_mtime = hdr->sync_stamp; |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
749 |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
750 if ((mbox->last_dirty_flags & MAILDIR_DIRTY_CUR) != 0 && |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
751 mbox->dirty_cur_time < mbox->last_cur_mtime) |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
752 mbox->dirty_cur_time = mbox->last_cur_mtime; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
753 |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
754 *hdr_r = *hdr; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
755 mail_index_view_close(&view); |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
756 } |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
757 |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
758 static int |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
759 maildir_sync_quick_check(struct maildir_mailbox *mbox, |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
760 const char *new_dir, const char *cur_dir, |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
761 bool *new_changed_r, bool *cur_changed_r) |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
762 { |
|
4126
63d6890803b3
If mailbox is opened in non-readonly state and there are mails in new/, make
Timo Sirainen <tss@iki.fi>
parents:
4107
diff
changeset
|
763 struct index_mailbox *ibox = &mbox->ibox; |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
764 struct mail_index_header hdr; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
765 struct stat st; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
766 time_t new_mtime, cur_mtime; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
767 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
768 *new_changed_r = *cur_changed_r = FALSE; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
769 |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
770 if (stat(new_dir, &st) < 0) { |
|
5708
7420a96ebc8f
If new/ directory is lost when syncing, assume the mailbox was deleted and
Timo Sirainen <tss@iki.fi>
parents:
5643
diff
changeset
|
771 if (errno == ENOENT) { |
|
7420a96ebc8f
If new/ directory is lost when syncing, assume the mailbox was deleted and
Timo Sirainen <tss@iki.fi>
parents:
5643
diff
changeset
|
772 /* mailbox was deleted under us. this isn't the only |
|
7420a96ebc8f
If new/ directory is lost when syncing, assume the mailbox was deleted and
Timo Sirainen <tss@iki.fi>
parents:
5643
diff
changeset
|
773 way it can break, but the most common one. */ |
|
7420a96ebc8f
If new/ directory is lost when syncing, assume the mailbox was deleted and
Timo Sirainen <tss@iki.fi>
parents:
5643
diff
changeset
|
774 ibox->mailbox_deleted = TRUE; |
|
7420a96ebc8f
If new/ directory is lost when syncing, assume the mailbox was deleted and
Timo Sirainen <tss@iki.fi>
parents:
5643
diff
changeset
|
775 return -1; |
|
7420a96ebc8f
If new/ directory is lost when syncing, assume the mailbox was deleted and
Timo Sirainen <tss@iki.fi>
parents:
5643
diff
changeset
|
776 } |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
777 mail_storage_set_critical(&mbox->storage->storage, |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
778 "stat(%s) failed: %m", new_dir); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
779 return -1; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
780 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
781 new_mtime = st.st_mtime; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
782 |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
783 if (stat(cur_dir, &st) < 0) { |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
784 mail_storage_set_critical(&mbox->storage->storage, |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
785 "stat(%s) failed: %m", cur_dir); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
786 return -1; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
787 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
788 cur_mtime = st.st_mtime; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
789 |
|
2893
fd431866c674
mail_index_refresh() isn't public anymore, mail_index_view_open_locked()
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
790 /* cur stamp is kept in index, we don't have to sync if |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
791 someone else has done it and updated the index. |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
792 |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
793 FIXME: For now we're using sync_size field as the new/ dir's stamp. |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
794 Pretty ugly.. */ |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
795 maildir_sync_update_from_header(mbox, &hdr); |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
796 if ((mbox->dirty_cur_time == 0 && cur_mtime != mbox->last_cur_mtime) || |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
797 (new_mtime != mbox->last_new_mtime)) { |
|
2893
fd431866c674
mail_index_refresh() isn't public anymore, mail_index_view_open_locked()
Timo Sirainen <tss@iki.fi>
parents:
2892
diff
changeset
|
798 /* check if the index has been updated.. */ |
|
4126
63d6890803b3
If mailbox is opened in non-readonly state and there are mails in new/, make
Timo Sirainen <tss@iki.fi>
parents:
4107
diff
changeset
|
799 if (mail_index_refresh(ibox->index) < 0) { |
|
63d6890803b3
If mailbox is opened in non-readonly state and there are mails in new/, make
Timo Sirainen <tss@iki.fi>
parents:
4107
diff
changeset
|
800 mail_storage_set_index_error(ibox); |
|
2064
5cfdc99fab69
Don't use internal last_cur_mtime stamp - it's index-specific so always get
Timo Sirainen <tss@iki.fi>
parents:
2053
diff
changeset
|
801 return -1; |
|
5cfdc99fab69
Don't use internal last_cur_mtime stamp - it's index-specific so always get
Timo Sirainen <tss@iki.fi>
parents:
2053
diff
changeset
|
802 } |
|
5cfdc99fab69
Don't use internal last_cur_mtime stamp - it's index-specific so always get
Timo Sirainen <tss@iki.fi>
parents:
2053
diff
changeset
|
803 |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
804 maildir_sync_update_from_header(mbox, &hdr); |
| 1954 | 805 } |
| 806 | |
|
4126
63d6890803b3
If mailbox is opened in non-readonly state and there are mails in new/, make
Timo Sirainen <tss@iki.fi>
parents:
4107
diff
changeset
|
807 /* If we're removing recent flags, always sync new/ directory if |
|
63d6890803b3
If mailbox is opened in non-readonly state and there are mails in new/, make
Timo Sirainen <tss@iki.fi>
parents:
4107
diff
changeset
|
808 it has mails. */ |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
809 if (new_mtime != mbox->last_new_mtime || |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
810 ((mbox->last_dirty_flags & MAILDIR_DIRTY_NEW) != 0 && |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
811 new_mtime < ioloop_time - MAILDIR_SYNC_SECS) || |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
812 (!ibox->keep_recent && hdr.recent_messages_count > 0)) { |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
813 *new_changed_r = TRUE; |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
814 mbox->last_new_mtime = new_mtime; |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
815 |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
816 if (new_mtime < ioloop_time - MAILDIR_SYNC_SECS) |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
817 mbox->last_dirty_flags &= ~MAILDIR_DIRTY_NEW; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
818 else |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
819 mbox->last_dirty_flags |= MAILDIR_DIRTY_NEW; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
820 } |
| 1954 | 821 |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
822 if (cur_mtime != mbox->last_cur_mtime || |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
823 (mbox->dirty_cur_time != 0 && |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
824 ioloop_time - mbox->dirty_cur_time > MAILDIR_SYNC_SECS)) { |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
825 /* cur/ changed, or delayed cur/ check */ |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
826 *cur_changed_r = TRUE; |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
827 mbox->last_cur_mtime = cur_mtime; |
| 1984 | 828 |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
829 if (cur_mtime < ioloop_time - MAILDIR_SYNC_SECS) { |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
830 mbox->last_dirty_flags &= ~MAILDIR_DIRTY_CUR; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
831 mbox->dirty_cur_time = 0; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
832 } else { |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
833 mbox->last_dirty_flags |= MAILDIR_DIRTY_CUR; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
834 mbox->dirty_cur_time = cur_mtime; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
835 } |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
836 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
837 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
838 return 0; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
839 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
840 |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
841 int maildir_sync_index_begin(struct maildir_mailbox *mbox, |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
842 struct maildir_index_sync_context **ctx_r) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
843 { |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
844 struct maildir_index_sync_context *ctx; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
845 struct mail_index_sync_ctx *sync_ctx; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
846 struct mail_index_view *view; |
|
5643
453128e12b11
mail_index_sync_begin() returns now transaction directly so the syncing code
Timo Sirainen <tss@iki.fi>
parents:
5588
diff
changeset
|
847 struct mail_index_transaction *trans; |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
848 |
|
5643
453128e12b11
mail_index_sync_begin() returns now transaction directly so the syncing code
Timo Sirainen <tss@iki.fi>
parents:
5588
diff
changeset
|
849 if (mail_index_sync_begin(mbox->ibox.index, &sync_ctx, &view, &trans, |
|
5779
b25c9ca2142b
mail_index_sync_begin() takes now flags parameter instead of two booleans.
Timo Sirainen <tss@iki.fi>
parents:
5743
diff
changeset
|
850 (uint32_t)-1, (uoff_t)-1, 0) <= 0) { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
851 mail_storage_set_index_error(&mbox->ibox); |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
852 return -1; |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
853 } |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
854 |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
855 ctx = i_new(struct maildir_index_sync_context, 1); |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
856 ctx->mbox = mbox; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
857 ctx->sync_ctx = sync_ctx; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
858 ctx->view = view; |
|
5643
453128e12b11
mail_index_sync_begin() returns now transaction directly so the syncing code
Timo Sirainen <tss@iki.fi>
parents:
5588
diff
changeset
|
859 ctx->trans = trans; |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
860 ctx->keywords_sync_ctx = |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
861 maildir_keywords_sync_init(mbox->keywords, mbox->ibox.index); |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
862 *ctx_r = ctx; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
863 return 0; |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
864 } |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
865 |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
866 int maildir_sync_index_finish(struct maildir_index_sync_context **_sync_ctx, |
|
4774
615b7738a62f
Saving mails could have skipped over transactions, which caused different
Timo Sirainen <tss@iki.fi>
parents:
4612
diff
changeset
|
867 bool failed, bool cancel) |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
868 { |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
869 struct maildir_index_sync_context *sync_ctx = *_sync_ctx; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
870 struct maildir_mailbox *mbox = sync_ctx->mbox; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
871 int ret = failed ? -1 : 0; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
872 |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
873 *_sync_ctx = NULL; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
874 |
|
4774
615b7738a62f
Saving mails could have skipped over transactions, which caused different
Timo Sirainen <tss@iki.fi>
parents:
4612
diff
changeset
|
875 if (ret < 0 || cancel) |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
876 mail_index_sync_rollback(&sync_ctx->sync_ctx); |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
877 else { |
|
4612
2c033ffc8f6f
maildir_storage_sync_force() crashed if called from mail index sync/expunge
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
878 /* Set syncing_commit=TRUE so that if any sync callbacks try |
|
2c033ffc8f6f
maildir_storage_sync_force() crashed if called from mail index sync/expunge
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
879 to access mails which got lost (eg. expunge callback trying |
|
2c033ffc8f6f
maildir_storage_sync_force() crashed if called from mail index sync/expunge
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
880 to open the file which was just unlinked) we don't try to |
|
2c033ffc8f6f
maildir_storage_sync_force() crashed if called from mail index sync/expunge
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
881 start a second index sync and crash. */ |
|
2c033ffc8f6f
maildir_storage_sync_force() crashed if called from mail index sync/expunge
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
882 mbox->syncing_commit = TRUE; |
| 5080 | 883 if (mail_index_sync_commit(&sync_ctx->sync_ctx) < 0) { |
| 884 mail_storage_set_index_error(&mbox->ibox); | |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
885 ret = -1; |
| 5080 | 886 } else { |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
887 mbox->ibox.commit_log_file_seq = 0; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
888 mbox->ibox.commit_log_file_offset = 0; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
889 } |
|
4612
2c033ffc8f6f
maildir_storage_sync_force() crashed if called from mail index sync/expunge
Timo Sirainen <tss@iki.fi>
parents:
4596
diff
changeset
|
890 mbox->syncing_commit = FALSE; |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
891 } |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
892 |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
893 maildir_keywords_sync_deinit(sync_ctx->keywords_sync_ctx); |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
894 sync_ctx->keywords_sync_ctx = NULL; |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
895 |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
896 i_free(sync_ctx); |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
897 return ret; |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
898 } |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
899 |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
900 int maildir_sync_index(struct maildir_index_sync_context *sync_ctx, |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
901 bool partial) |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
902 { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
903 struct maildir_mailbox *mbox = sync_ctx->mbox; |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
904 struct mail_index_view *view = sync_ctx->view; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
905 struct maildir_uidlist_iter_ctx *iter; |
|
5643
453128e12b11
mail_index_sync_begin() returns now transaction directly so the syncing code
Timo Sirainen <tss@iki.fi>
parents:
5588
diff
changeset
|
906 struct mail_index_transaction *trans = sync_ctx->trans; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
907 const struct mail_index_header *hdr; |
|
5850
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
908 struct mail_index_header empty_hdr; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
909 const struct mail_index_record *rec; |
| 5229 | 910 uint32_t seq, uid, prev_uid; |
| 1954 | 911 enum maildir_uidlist_rec_flag uflags; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
912 const char *filename; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
913 enum mail_flags flags; |
|
4451
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4450
diff
changeset
|
914 ARRAY_TYPE(keyword_indexes) keywords; |
|
1a35d53c18fc
Array API redesigned to work using unions. It now provides type safety
Timo Sirainen <tss@iki.fi>
parents:
4450
diff
changeset
|
915 ARRAY_TYPE(keyword_indexes) idx_keywords; |
|
2050
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
916 uint32_t uid_validity, next_uid; |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
917 uint64_t value; |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
918 int ret = 0; |
|
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
919 bool full_rescan = FALSE; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
920 |
| 3453 | 921 i_assert(maildir_uidlist_is_locked(sync_ctx->mbox->uidlist)); |
| 922 | |
|
2892
62d53b49110d
Changed mail_index_get_header() to return the header as return value because
Timo Sirainen <tss@iki.fi>
parents:
2877
diff
changeset
|
923 hdr = mail_index_get_header(view); |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
924 uid_validity = maildir_uidlist_get_uid_validity(mbox->uidlist); |
|
2051
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
925 if (uid_validity != hdr->uid_validity && |
|
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
926 uid_validity != 0 && hdr->uid_validity != 0) { |
|
2050
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
927 /* uidvalidity changed and mailbox isn't being initialized, |
|
3322
49071cc19102
If UIDVALIDITY changes, don't invalidate the whole index. Just expunge all
Timo Sirainen <tss@iki.fi>
parents:
3280
diff
changeset
|
928 reset mailbox so we can add all messages as new */ |
|
5850
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
929 i_warning("Maildir %s: UIDVALIDITY changed (%u -> %u)", |
|
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
930 mbox->path, hdr->uid_validity, uid_validity); |
|
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
931 mail_index_reset(trans); |
|
3322
49071cc19102
If UIDVALIDITY changes, don't invalidate the whole index. Just expunge all
Timo Sirainen <tss@iki.fi>
parents:
3280
diff
changeset
|
932 |
|
5850
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
933 memset(&empty_hdr, 0, sizeof(empty_hdr)); |
|
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
934 empty_hdr.next_uid = 1; |
|
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
935 hdr = &empty_hdr; |
|
2050
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
936 } |
|
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
937 |
| 5229 | 938 seq = prev_uid = 0; |
|
4596
bf4e98a0de3f
Replaced ARRAY_CREATE() macro with [ipt]_array_init() macros. The macro
Timo Sirainen <tss@iki.fi>
parents:
4594
diff
changeset
|
939 t_array_init(&keywords, MAILDIR_MAX_KEYWORDS); |
|
bf4e98a0de3f
Replaced ARRAY_CREATE() macro with [ipt]_array_init() macros. The macro
Timo Sirainen <tss@iki.fi>
parents:
4594
diff
changeset
|
940 t_array_init(&idx_keywords, MAILDIR_MAX_KEYWORDS); |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
941 iter = maildir_uidlist_iter_init(mbox->uidlist); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
942 while (maildir_uidlist_iter_next(iter, &uid, &uflags, &filename)) { |
|
3775
8321e6191275
maildir_copy_with_hardlinks works again.
Timo Sirainen <tss@iki.fi>
parents:
3583
diff
changeset
|
943 maildir_filename_get_flags(sync_ctx->keywords_sync_ctx, |
|
8321e6191275
maildir_copy_with_hardlinks works again.
Timo Sirainen <tss@iki.fi>
parents:
3583
diff
changeset
|
944 filename, &flags, &keywords); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
945 |
| 5229 | 946 i_assert(uid > prev_uid); |
| 947 prev_uid = uid; | |
| 948 | |
|
4107
d29677c59dc5
Keep \Seen flags privately only in indexes with shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
3879
diff
changeset
|
949 /* the private flags are kept only in indexes. don't use them |
|
d29677c59dc5
Keep \Seen flags privately only in indexes with shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
3879
diff
changeset
|
950 at all even for newly seen mails */ |
|
d29677c59dc5
Keep \Seen flags privately only in indexes with shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
3879
diff
changeset
|
951 flags &= ~mbox->private_flags_mask; |
|
d29677c59dc5
Keep \Seen flags privately only in indexes with shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
3879
diff
changeset
|
952 |
|
2038
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
953 if ((uflags & MAILDIR_UIDLIST_REC_FLAG_RECENT) != 0 && |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
954 (uflags & MAILDIR_UIDLIST_REC_FLAG_NEW_DIR) != 0 && |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
955 (uflags & MAILDIR_UIDLIST_REC_FLAG_MOVED) == 0) { |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
956 /* mail is recent for next session as well */ |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
957 flags |= MAIL_RECENT; |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
958 } |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
959 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
960 __again: |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
961 seq++; |
| 1954 | 962 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
963 if (seq > hdr->messages_count) { |
| 1984 | 964 if (uid < hdr->next_uid) { |
| 2053 | 965 /* most likely a race condition: we read the |
| 966 maildir, then someone else expunged messages | |
| 967 and committed changes to index. so, this | |
| 968 message shouldn't actually exist. mark it | |
| 969 racy and check in next sync. | |
| 970 | |
| 971 the difference between this and the later | |
| 972 check is that this one happens when messages | |
| 973 are expunged from the end */ | |
| 974 if ((uflags & | |
| 2228 | 975 MAILDIR_UIDLIST_REC_FLAG_NONSYNCED) != 0) { |
| 976 /* partial syncing */ | |
| 977 continue; | |
| 978 } | |
| 979 if ((uflags & | |
| 2053 | 980 MAILDIR_UIDLIST_REC_FLAG_RACING) != 0) { |
| 981 mail_storage_set_critical( | |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
982 &mbox->storage->storage, |
|
2067
3f97439ba59e
Path was missing from Maildir sync-errors.
Timo Sirainen <tss@iki.fi>
parents:
2064
diff
changeset
|
983 "Maildir %s sync: " |
|
3f97439ba59e
Path was missing from Maildir sync-errors.
Timo Sirainen <tss@iki.fi>
parents:
2064
diff
changeset
|
984 "UID < next_uid " |
| 2053 | 985 "(%u < %u, file = %s)", |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
986 mbox->path, uid, hdr->next_uid, |
|
2067
3f97439ba59e
Path was missing from Maildir sync-errors.
Timo Sirainen <tss@iki.fi>
parents:
2064
diff
changeset
|
987 filename); |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
988 mail_index_mark_corrupted( |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
989 mbox->ibox.index); |
| 2053 | 990 ret = -1; |
| 991 break; | |
| 992 } | |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
993 mbox->dirty_cur_time = ioloop_time; |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
994 maildir_uidlist_add_flags(mbox->uidlist, |
| 2053 | 995 filename, |
| 996 MAILDIR_UIDLIST_REC_FLAG_RACING); | |
| 997 | |
| 998 seq--; | |
| 999 continue; | |
| 1984 | 1000 } |
| 1001 | |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1002 mail_index_append(trans, uid, &seq); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1003 mail_index_update_flags(trans, seq, MODIFY_REPLACE, |
|
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2936
diff
changeset
|
1004 flags); |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1005 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1006 if (array_count(&keywords) > 0) { |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1007 struct mail_keywords *kw; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1008 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1009 kw = mail_index_keywords_create_from_indexes( |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1010 trans, &keywords); |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1011 mail_index_update_keywords(trans, seq, |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1012 MODIFY_REPLACE, kw); |
|
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
1013 mail_index_keywords_free(&kw); |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1014 } |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1015 continue; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1016 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1017 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1018 if (mail_index_lookup(view, seq, &rec) < 0) { |
| 5080 | 1019 mail_storage_set_index_error(&mbox->ibox); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1020 ret = -1; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1021 break; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1022 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1023 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1024 if (rec->uid < uid) { |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1025 /* expunged */ |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1026 mail_index_expunge(trans, seq); |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1027 goto __again; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1028 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1029 |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1030 if (rec->uid > uid) { |
|
2034
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1031 /* most likely a race condition: we read the |
|
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1032 maildir, then someone else expunged messages and |
|
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1033 committed changes to index. so, this message |
| 2053 | 1034 shouldn't actually exist. mark it racy and check |
| 1035 in next sync. */ | |
| 2228 | 1036 if ((uflags & |
| 1037 MAILDIR_UIDLIST_REC_FLAG_NONSYNCED) != 0) { | |
| 1038 /* partial syncing */ | |
| 1039 seq--; | |
| 1040 continue; | |
| 1041 } | |
| 2053 | 1042 if ((uflags & MAILDIR_UIDLIST_REC_FLAG_RACING) != 0) { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1043 mail_storage_set_critical( |
|
5459
78eaf595359c
Removed struct index_storage abstraction. It's pointless.
Timo Sirainen <tss@iki.fi>
parents:
5443
diff
changeset
|
1044 &mbox->storage->storage, |
| 2570 | 1045 "Maildir %s sync: " |
| 1046 "UID inserted in the middle of mailbox " | |
|
2034
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1047 "(%u > %u, file = %s)", |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1048 mbox->path, rec->uid, uid, filename); |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1049 mail_index_mark_corrupted(mbox->ibox.index); |
|
2034
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1050 ret = -1; |
|
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1051 break; |
|
2064
5cfdc99fab69
Don't use internal last_cur_mtime stamp - it's index-specific so always get
Timo Sirainen <tss@iki.fi>
parents:
2053
diff
changeset
|
1052 } |
| 2053 | 1053 |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1054 mbox->dirty_cur_time = ioloop_time; |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1055 maildir_uidlist_add_flags(mbox->uidlist, filename, |
| 2053 | 1056 MAILDIR_UIDLIST_REC_FLAG_RACING); |
|
2034
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1057 |
|
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1058 seq--; |
|
8078400fe561
Fix bogus "UID inserted in the middle of mailbox" errors
Timo Sirainen <tss@iki.fi>
parents:
2033
diff
changeset
|
1059 continue; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1060 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1061 |
|
4107
d29677c59dc5
Keep \Seen flags privately only in indexes with shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
3879
diff
changeset
|
1062 /* the private flags are stored only in indexes, keep them */ |
|
d29677c59dc5
Keep \Seen flags privately only in indexes with shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
3879
diff
changeset
|
1063 flags |= rec->flags & mbox->private_flags_mask; |
|
d29677c59dc5
Keep \Seen flags privately only in indexes with shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
3879
diff
changeset
|
1064 |
|
2320
8a6666a9ac98
Handle recent flags in index file correctly. Fixes recent flag losing when
Timo Sirainen <tss@iki.fi>
parents:
2272
diff
changeset
|
1065 if ((rec->flags & MAIL_RECENT) != 0) { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1066 index_mailbox_set_recent(&mbox->ibox, seq); |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1067 if (mbox->ibox.keep_recent) { |
|
2320
8a6666a9ac98
Handle recent flags in index file correctly. Fixes recent flag losing when
Timo Sirainen <tss@iki.fi>
parents:
2272
diff
changeset
|
1068 flags |= MAIL_RECENT; |
|
8a6666a9ac98
Handle recent flags in index file correctly. Fixes recent flag losing when
Timo Sirainen <tss@iki.fi>
parents:
2272
diff
changeset
|
1069 } else { |
|
8a6666a9ac98
Handle recent flags in index file correctly. Fixes recent flag losing when
Timo Sirainen <tss@iki.fi>
parents:
2272
diff
changeset
|
1070 mail_index_update_flags(trans, seq, |
|
8a6666a9ac98
Handle recent flags in index file correctly. Fixes recent flag losing when
Timo Sirainen <tss@iki.fi>
parents:
2272
diff
changeset
|
1071 MODIFY_REMOVE, |
|
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2936
diff
changeset
|
1072 MAIL_RECENT); |
|
2320
8a6666a9ac98
Handle recent flags in index file correctly. Fixes recent flag losing when
Timo Sirainen <tss@iki.fi>
parents:
2272
diff
changeset
|
1073 } |
|
8a6666a9ac98
Handle recent flags in index file correctly. Fixes recent flag losing when
Timo Sirainen <tss@iki.fi>
parents:
2272
diff
changeset
|
1074 } |
|
8a6666a9ac98
Handle recent flags in index file correctly. Fixes recent flag losing when
Timo Sirainen <tss@iki.fi>
parents:
2272
diff
changeset
|
1075 |
| 2228 | 1076 if ((uflags & MAILDIR_UIDLIST_REC_FLAG_NONSYNCED) != 0) { |
| 1077 /* partial syncing */ | |
|
3436
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1078 if ((flags & MAIL_RECENT) != 0) { |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1079 /* we last saw this mail in new/, but it's |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1080 not there anymore. possibly expunged, |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1081 make sure. */ |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1082 full_rescan = TRUE; |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1083 } |
| 2228 | 1084 continue; |
| 1085 } | |
| 1086 | |
|
1956
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
1087 if ((rec->flags & MAIL_INDEX_MAIL_FLAG_DIRTY) != 0) { |
|
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
1088 /* we haven't been able to update maildir with this |
|
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
1089 record's flag changes. don't sync them. */ |
|
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
1090 continue; |
|
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
1091 } |
|
d6941cd8afdc
Added support for setting dirty flags for messages (TODO: undirty..)
Timo Sirainen <tss@iki.fi>
parents:
1955
diff
changeset
|
1092 |
|
2038
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
1093 if (((uint8_t)flags & ~MAIL_RECENT) != |
|
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2936
diff
changeset
|
1094 (rec->flags & (MAIL_FLAGS_MASK^MAIL_RECENT))) { |
|
2038
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
1095 /* FIXME: this is wrong if there's pending changes in |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
1096 transaction log already. it gets fixed in next sync |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
1097 however.. */ |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1098 mail_index_update_flags(trans, seq, MODIFY_REPLACE, |
|
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2936
diff
changeset
|
1099 flags); |
|
2038
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
1100 } else if ((flags & MAIL_RECENT) == 0 && |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
1101 (rec->flags & MAIL_RECENT) != 0) { |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
1102 /* just remove recent flag */ |
|
df504dad3aec
Recent flag fixes. Should work perfectly now with maildir.
Timo Sirainen <tss@iki.fi>
parents:
2037
diff
changeset
|
1103 mail_index_update_flags(trans, seq, MODIFY_REMOVE, |
|
3016
61c8d205d887
Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents:
2936
diff
changeset
|
1104 MAIL_RECENT); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1105 } |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1106 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1107 /* update keywords if they have changed */ |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1108 if (mail_index_lookup_keywords(view, seq, &idx_keywords) < 0) { |
| 5080 | 1109 mail_storage_set_index_error(&mbox->ibox); |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1110 ret = -1; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1111 break; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1112 } |
|
3821
c8b2ed2c9961
We assumed that keyword index arrays were always sorted. This isn't always
Timo Sirainen <tss@iki.fi>
parents:
3776
diff
changeset
|
1113 if (!index_keyword_array_cmp(&keywords, &idx_keywords)) { |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1114 struct mail_keywords *kw; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1115 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1116 kw = mail_index_keywords_create_from_indexes( |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1117 trans, &keywords); |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1118 mail_index_update_keywords(trans, seq, |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1119 MODIFY_REPLACE, kw); |
|
3879
928229f8b3e6
deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents:
3863
diff
changeset
|
1120 mail_index_keywords_free(&kw); |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1121 } |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1122 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1123 maildir_uidlist_iter_deinit(iter); |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1124 array_free(&keywords); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1125 |
|
3776
0cae3268c8af
Accidentally had changed !partial-check to partial-check. Because of this
Timo Sirainen <tss@iki.fi>
parents:
3775
diff
changeset
|
1126 if (!partial) { |
| 1954 | 1127 /* expunge the rest */ |
| 1128 for (seq++; seq <= hdr->messages_count; seq++) | |
| 1129 mail_index_expunge(trans, seq); | |
|
3583
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1130 |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1131 /* next_uid must be updated only in non-partial syncs since |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1132 partial syncs don't add the new mails to index. also we'll |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1133 have to do it here before syncing index records, since after |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1134 that the uidlist's next_uid value may have changed. */ |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1135 next_uid = maildir_uidlist_get_next_uid(mbox->uidlist); |
|
5850
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
1136 i_assert(next_uid > prev_uid); |
|
5369
e897aaa24cdd
If uidlist is deleted and we set the uidvalidity from the index file, set
Timo Sirainen <tss@iki.fi>
parents:
5368
diff
changeset
|
1137 if (hdr->next_uid < next_uid) { |
|
3583
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1138 mail_index_update_header(trans, |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1139 offsetof(struct mail_index_header, next_uid), |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1140 &next_uid, sizeof(next_uid), FALSE); |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1141 } |
| 1954 | 1142 } |
| 1143 | |
|
5850
f8caf3c6a5a7
Handle UIDVALIDITY changes by resetting index.
Timo Sirainen <tss@iki.fi>
parents:
5779
diff
changeset
|
1144 if (!mbox->syncing_commit && hdr != &empty_hdr) { |
|
3583
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1145 /* now, sync the index. NOTE: may recurse back to here with |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1146 partial syncs */ |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1147 mbox->syncing_commit = TRUE; |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1148 if (maildir_sync_index_records(sync_ctx) < 0) |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1149 ret = -1; |
|
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1150 mbox->syncing_commit = FALSE; |
|
5564
47274663a71c
Call sync_notify() once at the end of syncing. Allow accessing mails even
Timo Sirainen <tss@iki.fi>
parents:
5562
diff
changeset
|
1151 |
|
47274663a71c
Call sync_notify() once at the end of syncing. Allow accessing mails even
Timo Sirainen <tss@iki.fi>
parents:
5562
diff
changeset
|
1152 if (mbox->ibox.box.v.sync_notify != NULL) |
|
47274663a71c
Call sync_notify() once at the end of syncing. Allow accessing mails even
Timo Sirainen <tss@iki.fi>
parents:
5562
diff
changeset
|
1153 mbox->ibox.box.v.sync_notify(&mbox->ibox.box, 0, 0); |
|
3583
a45208fe7c83
Partial syncs caused index's next_uid to be updated even if the new mails
Timo Sirainen <tss@iki.fi>
parents:
3579
diff
changeset
|
1154 } |
|
2037
8763032d31bd
Set dirty flags through transaction log, not directly. Some other flag
Timo Sirainen <tss@iki.fi>
parents:
2034
diff
changeset
|
1155 |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
1156 if (mbox->dirty_cur_time != 0) |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
1157 mbox->last_dirty_flags |= MAILDIR_DIRTY_CUR; |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
1158 |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
1159 if (mbox->last_cur_mtime != (time_t)hdr->sync_stamp) { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1160 uint32_t sync_stamp = mbox->last_cur_mtime; |
|
2050
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1161 |
|
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1162 mail_index_update_header(trans, |
|
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1163 offsetof(struct mail_index_header, sync_stamp), |
|
3322
49071cc19102
If UIDVALIDITY changes, don't invalidate the whole index. Just expunge all
Timo Sirainen <tss@iki.fi>
parents:
3280
diff
changeset
|
1164 &sync_stamp, sizeof(sync_stamp), TRUE); |
|
2050
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1165 } |
|
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1166 |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1167 /* FIXME: use a header extension instead of sync_size.. */ |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
1168 value = mbox->last_new_mtime | |
|
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
1169 ((uint64_t)mbox->last_dirty_flags << 32); |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1170 if (value != hdr->sync_size) { |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1171 mail_index_update_header(trans, |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1172 offsetof(struct mail_index_header, sync_size), |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
1173 &value, sizeof(value), TRUE); |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1174 } |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1175 |
|
2051
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1176 if (hdr->uid_validity == 0) { |
|
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1177 /* get the initial uidvalidity */ |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1178 if (maildir_uidlist_update(mbox->uidlist) < 0) |
|
2051
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1179 ret = -1; |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1180 uid_validity = maildir_uidlist_get_uid_validity(mbox->uidlist); |
|
2051
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1181 if (uid_validity == 0) { |
|
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1182 uid_validity = ioloop_time; |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1183 maildir_uidlist_set_uid_validity(mbox->uidlist, |
|
5388
ce1bfc98df29
Last fix broke creating new uidlists.
Timo Sirainen <tss@iki.fi>
parents:
5369
diff
changeset
|
1184 uid_validity, 0); |
|
2051
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1185 } |
|
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1186 } else if (uid_validity == 0) { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1187 maildir_uidlist_set_uid_validity(mbox->uidlist, |
|
5369
e897aaa24cdd
If uidlist is deleted and we set the uidvalidity from the index file, set
Timo Sirainen <tss@iki.fi>
parents:
5368
diff
changeset
|
1188 hdr->uid_validity, |
|
e897aaa24cdd
If uidlist is deleted and we set the uidvalidity from the index file, set
Timo Sirainen <tss@iki.fi>
parents:
5368
diff
changeset
|
1189 hdr->next_uid); |
|
2051
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1190 } |
|
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1191 |
|
596267d8e2e2
Some more UIDVALIDITY issues fixed.
Timo Sirainen <tss@iki.fi>
parents:
2050
diff
changeset
|
1192 if (uid_validity != hdr->uid_validity && uid_validity != 0) { |
|
2050
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1193 mail_index_update_header(trans, |
|
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1194 offsetof(struct mail_index_header, uid_validity), |
|
3322
49071cc19102
If UIDVALIDITY changes, don't invalidate the whole index. Just expunge all
Timo Sirainen <tss@iki.fi>
parents:
3280
diff
changeset
|
1195 &uid_validity, sizeof(uid_validity), TRUE); |
|
2050
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1196 } |
|
ee1095ccfd23
Index header changes now go through transaction log. Removed the kludgy
Timo Sirainen <tss@iki.fi>
parents:
2039
diff
changeset
|
1197 |
|
3436
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1198 return ret < 0 ? -1 : (full_rescan ? 0 : 1); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1199 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1200 |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
1201 static int maildir_sync_context(struct maildir_sync_context *ctx, bool forced, |
|
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
1202 bool sync_last_commit) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1203 { |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
1204 bool new_changed, cur_changed, full_rescan = FALSE; |
|
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
1205 int ret; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1206 |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1207 if (sync_last_commit) { |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1208 new_changed = cur_changed = FALSE; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1209 } else if (!forced) { |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1210 if (maildir_sync_quick_check(ctx->mbox, |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1211 ctx->new_dir, ctx->cur_dir, |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1212 &new_changed, &cur_changed) < 0) |
|
2140
e2cd51b99359
"readonly sync" -> "forced sync"
Timo Sirainen <tss@iki.fi>
parents:
2123
diff
changeset
|
1213 return -1; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1214 |
|
2140
e2cd51b99359
"readonly sync" -> "forced sync"
Timo Sirainen <tss@iki.fi>
parents:
2123
diff
changeset
|
1215 if (!new_changed && !cur_changed) |
|
3579
09565508b8ba
We were forcing a maildir resync when it hadn't changed at all.
Timo Sirainen <tss@iki.fi>
parents:
3563
diff
changeset
|
1216 return 1; |
|
2140
e2cd51b99359
"readonly sync" -> "forced sync"
Timo Sirainen <tss@iki.fi>
parents:
2123
diff
changeset
|
1217 } else { |
|
e2cd51b99359
"readonly sync" -> "forced sync"
Timo Sirainen <tss@iki.fi>
parents:
2123
diff
changeset
|
1218 new_changed = cur_changed = TRUE; |
|
e2cd51b99359
"readonly sync" -> "forced sync"
Timo Sirainen <tss@iki.fi>
parents:
2123
diff
changeset
|
1219 } |
| 1947 | 1220 |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1221 /* |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1222 Locking, locking, locking.. Wasn't maildir supposed to be lockless? |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1223 |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1224 We can get here either as beginning a real maildir sync, or when |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1225 committing changes to maildir but a file was lost (maybe renamed). |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1226 |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1227 So, we're going to need two locks. One for index and one for |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1228 uidlist. To avoid deadlocking do the uidlist lock always first. |
| 2121 | 1229 |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1230 uidlist is needed only for figuring out UIDs for newly seen files, |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1231 so theoretically we wouldn't need to lock it unless there are new |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1232 files. It has a few problems though, assuming the index lock didn't |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1233 already protect it (eg. in-memory indexes): |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1234 |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1235 1. Just because you see a new file which doesn't exist in uidlist |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1236 file, doesn't mean that the file really exists anymore, or that |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1237 your readdir() lists all new files. Meaning that this is possible: |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1238 |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1239 A: opendir(), readdir() -> new file ... |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1240 -- new files are written to the maildir -- |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1241 B: opendir(), readdir() -> new file, lock uidlist, |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1242 readdir() -> another new file, rewrite uidlist, unlock |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1243 A: ... lock uidlist, readdir() -> nothing left, rewrite uidlist, |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1244 unlock |
|
2173
9438951e243f
Don't crash if we're syncing last commit to maildir, but some file was lost
Timo Sirainen <tss@iki.fi>
parents:
2140
diff
changeset
|
1245 |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1246 The second time running A didn't see the two new files. To handle |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1247 this correctly, it must not remove the new unseen files from |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1248 uidlist. This is possible to do, but adds extra complexity. |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1249 |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1250 2. If another process is rename()ing files while we are |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1251 readdir()ing, it's possible that readdir() never lists some files, |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1252 causing Dovecot to assume they were expunged. In next sync they |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1253 would show up again, but client could have already been notified of |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1254 that and they would show up under new UIDs, so the damage is |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1255 already done. |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1256 |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1257 Both of the problems can be avoided if we simply lock the uidlist |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1258 before syncing and keep it until sync is finished. Typically this |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1259 would happen in any case, as there is the index lock.. |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1260 |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1261 The second case is still a problem with external changes though, |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1262 because maildir doesn't require any kind of locking. Luckily this |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1263 problem rarely happens except under high amount of modifications. |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1264 */ |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1265 |
|
3530
e9695ec7925b
Recursive maildir uidlist syncs caused assert crashes. Also did some
Timo Sirainen <tss@iki.fi>
parents:
3520
diff
changeset
|
1266 ctx->partial = !cur_changed; |
|
e9695ec7925b
Recursive maildir uidlist syncs caused assert crashes. Also did some
Timo Sirainen <tss@iki.fi>
parents:
3520
diff
changeset
|
1267 ret = maildir_uidlist_sync_init(ctx->mbox->uidlist, ctx->partial, |
|
e9695ec7925b
Recursive maildir uidlist syncs caused assert crashes. Also did some
Timo Sirainen <tss@iki.fi>
parents:
3520
diff
changeset
|
1268 &ctx->uidlist_sync_ctx); |
|
e9695ec7925b
Recursive maildir uidlist syncs caused assert crashes. Also did some
Timo Sirainen <tss@iki.fi>
parents:
3520
diff
changeset
|
1269 if (ret <= 0) { |
|
2818
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1270 /* failure / timeout. if forced is TRUE, we could still go |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1271 forward and check only for renamed files, but is it worth |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1272 the trouble? .. */ |
|
a758a5b542bb
Always protect maildir syncing with uidlist lock. Before we only tried to
Timo Sirainen <tss@iki.fi>
parents:
2816
diff
changeset
|
1273 return ret; |
|
2140
e2cd51b99359
"readonly sync" -> "forced sync"
Timo Sirainen <tss@iki.fi>
parents:
2123
diff
changeset
|
1274 } |
| 2123 | 1275 |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1276 if (!ctx->mbox->syncing_commit) { |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1277 if (maildir_sync_index_begin(ctx->mbox, |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1278 &ctx->index_sync_ctx) < 0) |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1279 return -1; |
|
5368
7d45edb81fe4
When copying/syncing a lot of mails, send "* OK Hang in there" replies to
Timo Sirainen <tss@iki.fi>
parents:
5307
diff
changeset
|
1280 ctx->index_sync_ctx->maildir_sync_ctx = ctx; |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1281 } |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1282 |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1283 if (new_changed || cur_changed) { |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1284 /* if we're going to check cur/ dir our current logic requires |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1285 that new/ dir is checked as well. it's a good idea anyway. */ |
|
5391
0c8705aad54c
Avoid infinite looping when buggy filesystems.
Timo Sirainen <tss@iki.fi>
parents:
5390
diff
changeset
|
1286 unsigned int count = 0; |
|
0c8705aad54c
Avoid infinite looping when buggy filesystems.
Timo Sirainen <tss@iki.fi>
parents:
5390
diff
changeset
|
1287 |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1288 while ((ret = maildir_scan_dir(ctx, TRUE)) > 0) { |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1289 /* rename()d at least some files, which might have |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1290 caused some other files to be missed. check again |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1291 (see MAILDIR_RENAME_RESCAN_COUNT). */ |
|
5391
0c8705aad54c
Avoid infinite looping when buggy filesystems.
Timo Sirainen <tss@iki.fi>
parents:
5390
diff
changeset
|
1292 if (++count > MAILDIR_SCAN_DIR_MAX_COUNT) |
|
0c8705aad54c
Avoid infinite looping when buggy filesystems.
Timo Sirainen <tss@iki.fi>
parents:
5390
diff
changeset
|
1293 break; |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1294 } |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1295 if (ret < 0) |
| 1954 | 1296 return -1; |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1297 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1298 if (cur_changed) { |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1299 if (maildir_scan_dir(ctx, FALSE) < 0) |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1300 return -1; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1301 } |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1302 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1303 /* finish uidlist syncing, but keep it still locked */ |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1304 maildir_uidlist_sync_finish(ctx->uidlist_sync_ctx); |
| 1954 | 1305 } |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1306 |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1307 if (!ctx->mbox->syncing_commit) { |
|
3530
e9695ec7925b
Recursive maildir uidlist syncs caused assert crashes. Also did some
Timo Sirainen <tss@iki.fi>
parents:
3520
diff
changeset
|
1308 /* NOTE: index syncing here might cause a re-sync due to |
|
e9695ec7925b
Recursive maildir uidlist syncs caused assert crashes. Also did some
Timo Sirainen <tss@iki.fi>
parents:
3520
diff
changeset
|
1309 files getting lost, so this function might be called |
|
e9695ec7925b
Recursive maildir uidlist syncs caused assert crashes. Also did some
Timo Sirainen <tss@iki.fi>
parents:
3520
diff
changeset
|
1310 re-entrantly. FIXME: and that breaks in |
|
e9695ec7925b
Recursive maildir uidlist syncs caused assert crashes. Also did some
Timo Sirainen <tss@iki.fi>
parents:
3520
diff
changeset
|
1311 maildir_uidlist_sync_deinit() */ |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1312 ret = maildir_sync_index(ctx->index_sync_ctx, ctx->partial); |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1313 if (maildir_sync_index_finish(&ctx->index_sync_ctx, |
|
4774
615b7738a62f
Saving mails could have skipped over transactions, which caused different
Timo Sirainen <tss@iki.fi>
parents:
4612
diff
changeset
|
1314 ret < 0, FALSE) < 0) |
|
2173
9438951e243f
Don't crash if we're syncing last commit to maildir, but some file was lost
Timo Sirainen <tss@iki.fi>
parents:
2140
diff
changeset
|
1315 return -1; |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1316 |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1317 if (ret < 0) |
|
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1318 return -1; |
|
3436
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1319 if (ret == 0) |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1320 full_rescan = TRUE; |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1321 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1322 i_assert(maildir_uidlist_is_locked(ctx->mbox->uidlist)); |
|
2173
9438951e243f
Don't crash if we're syncing last commit to maildir, but some file was lost
Timo Sirainen <tss@iki.fi>
parents:
2140
diff
changeset
|
1323 } |
| 1984 | 1324 |
|
4238
3c8b191b0019
Adding mail to index while saving it had a race condition. Fixing it
Timo Sirainen <timo.sirainen@movial.fi>
parents:
4199
diff
changeset
|
1325 ret = maildir_uidlist_sync_deinit(&ctx->uidlist_sync_ctx); |
|
3436
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1326 return ret < 0 ? -1 : (full_rescan ? 0 : 1); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1327 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1328 |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1329 int maildir_storage_sync_force(struct maildir_mailbox *mbox) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1330 { |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1331 struct maildir_sync_context *ctx; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1332 int ret; |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1333 |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1334 ctx = maildir_sync_context_new(mbox); |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1335 ret = maildir_sync_context(ctx, TRUE, FALSE); |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1336 maildir_sync_deinit(ctx); |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1337 return ret < 0 ? -1 : 0; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1338 } |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1339 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1340 int maildir_sync_last_commit(struct maildir_mailbox *mbox) |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1341 { |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1342 struct maildir_sync_context *ctx; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1343 int ret; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1344 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1345 if (mbox->ibox.commit_log_file_seq == 0) |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1346 return 0; |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1347 |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1348 ctx = maildir_sync_context_new(mbox); |
|
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1349 ret = maildir_sync_context(ctx, FALSE, TRUE); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1350 maildir_sync_deinit(ctx); |
|
3436
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1351 return ret < 0 ? -1 : 0; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1352 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1353 |
|
2322
aae574ed7f4c
Broke mailbox_sync() into iterator.
Timo Sirainen <tss@iki.fi>
parents:
2320
diff
changeset
|
1354 struct mailbox_sync_context * |
|
aae574ed7f4c
Broke mailbox_sync() into iterator.
Timo Sirainen <tss@iki.fi>
parents:
2320
diff
changeset
|
1355 maildir_storage_sync_init(struct mailbox *box, enum mailbox_sync_flags flags) |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1356 { |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1357 struct maildir_mailbox *mbox = (struct maildir_mailbox *)box; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1358 struct maildir_sync_context *ctx; |
|
2322
aae574ed7f4c
Broke mailbox_sync() into iterator.
Timo Sirainen <tss@iki.fi>
parents:
2320
diff
changeset
|
1359 int ret = 0; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1360 |
|
4894
24afafbfe47b
Make sure the mailbox is opened when transaction is started (fixes deliver).
Timo Sirainen <tss@iki.fi>
parents:
4848
diff
changeset
|
1361 if (!box->opened) |
|
24afafbfe47b
Make sure the mailbox is opened when transaction is started (fixes deliver).
Timo Sirainen <tss@iki.fi>
parents:
4848
diff
changeset
|
1362 index_storage_mailbox_open(&mbox->ibox); |
|
4848
967de900c73a
Mailbox list indexing and related changes. Currently works only with
Timo Sirainen <tss@iki.fi>
parents:
4774
diff
changeset
|
1363 |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1364 if ((flags & MAILBOX_SYNC_FLAG_FAST) == 0 || |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1365 mbox->ibox.sync_last_check + MAILBOX_FULL_SYNC_INTERVAL <= |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1366 ioloop_time) { |
|
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1367 mbox->ibox.sync_last_check = ioloop_time; |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1368 |
|
3279
b698ae839a18
Moved mbox/maildir-specific variables from struct index_mailbox to
Timo Sirainen <tss@iki.fi>
parents:
3203
diff
changeset
|
1369 ctx = maildir_sync_context_new(mbox); |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1370 ret = maildir_sync_context(ctx, FALSE, FALSE); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1371 maildir_sync_deinit(ctx); |
|
3436
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1372 |
|
4152
e2edd333c473
Added MAILBOX_OPEN_KEEP_LOCKED flag to mailbox opening and implemented it
Timo Sirainen <tss@iki.fi>
parents:
4126
diff
changeset
|
1373 i_assert(!maildir_uidlist_is_locked(mbox->uidlist) || |
|
e2edd333c473
Added MAILBOX_OPEN_KEEP_LOCKED flag to mailbox opening and implemented it
Timo Sirainen <tss@iki.fi>
parents:
4126
diff
changeset
|
1374 mbox->ibox.keep_locked); |
|
3447
96de02ea7482
Keywords are stored in maildir filename and maildir-keywords file
Timo Sirainen <tss@iki.fi>
parents:
3446
diff
changeset
|
1375 |
|
3436
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1376 if (ret == 0) { |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1377 /* lost some files from new/, see if thery're in cur/ */ |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1378 ret = maildir_storage_sync_force(mbox); |
|
3c51658d6846
We didn't notice if messages were deleted directly from new/.
Timo Sirainen <tss@iki.fi>
parents:
3435
diff
changeset
|
1379 } |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1380 } |
|
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1381 |
|
2322
aae574ed7f4c
Broke mailbox_sync() into iterator.
Timo Sirainen <tss@iki.fi>
parents:
2320
diff
changeset
|
1382 return index_mailbox_sync_init(box, flags, ret < 0); |
|
1915
79790750c349
importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
1383 } |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1384 |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1385 int maildir_sync_is_synced(struct maildir_mailbox *mbox) |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1386 { |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1387 const char *new_dir, *cur_dir; |
|
3863
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
1388 bool new_changed, cur_changed; |
|
55df57c028d4
Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents:
3821
diff
changeset
|
1389 int ret; |
|
3472
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1390 |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1391 t_push(); |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1392 new_dir = t_strconcat(mbox->path, "/new", NULL); |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1393 cur_dir = t_strconcat(mbox->path, "/cur", NULL); |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1394 |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1395 ret = maildir_sync_quick_check(mbox, new_dir, cur_dir, |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1396 &new_changed, &cur_changed); |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1397 t_pop(); |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1398 return ret < 0 ? -1 : (!new_changed && !cur_changed); |
|
db29cc6754d5
Store new/ directory's timestamp in sync_size header in index (kludgy..).
Timo Sirainen <tss@iki.fi>
parents:
3470
diff
changeset
|
1399 } |