[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-mail.c, 1.33.2.1, 1.33.2.2

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv7681

Modified Files:
      Tag: branch_1_0
	mbox-mail.c 
Log Message:
If we can't find the mail from dirty mbox even after syncing, fail with
error instead of looping forever.



Index: mbox-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-mail.c,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- mbox-mail.c	15 Oct 2006 10:35:57 -0000	1.33.2.1
+++ mbox-mail.c	25 Jan 2007 09:39:06 -0000	1.33.2.2
@@ -35,54 +35,60 @@
 		(struct mbox_transaction_context *)mail->trans;
 	struct mbox_mailbox *mbox = (struct mbox_mailbox *)mail->ibox;
 	enum mbox_sync_flags sync_flags = 0;
-	int ret;
+	int ret, try;
 	bool deleted;
 
 	if (mail->mail.mail.expunged)
 		return 0;
 
-__again:
-	if (mbox->mbox_lock_type == F_UNLCK) {
-		sync_flags |= MBOX_SYNC_LOCK_READING;
-		if (mbox_sync(mbox, sync_flags) < 0)
-			return -1;
+	for (try = 0; try < 2; try++) {
+		if (mbox->mbox_lock_type == F_UNLCK) {
+			sync_flags |= MBOX_SYNC_LOCK_READING;
+			if (mbox_sync(mbox, sync_flags) < 0)
+				return -1;
 
-		/* refresh index file after mbox has been locked to make
-		   sure we get only up-to-date mbox offsets. */
-		if (mail_index_refresh(mbox->ibox.index) < 0) {
-			mail_storage_set_index_error(&mbox->ibox);
-			return -1;
+			/* refresh index file after mbox has been locked to
+			   make sure we get only up-to-date mbox offsets. */
+			if (mail_index_refresh(mbox->ibox.index) < 0) {
+				mail_storage_set_index_error(&mbox->ibox);
+				return -1;
+			}
+
+			i_assert(mbox->mbox_lock_type != F_UNLCK);
+			t->mbox_lock_id = mbox->mbox_lock_id;
+		} else if ((sync_flags & MBOX_SYNC_FORCE_SYNC) != 0) {
+			/* dirty offsets are broken and mbox is write-locked.
+			   sync it to update offsets. */
+			if (mbox_sync(mbox, sync_flags) < 0)
+				return -1;
 		}
 
-		i_assert(mbox->mbox_lock_type != F_UNLCK);
-		t->mbox_lock_id = mbox->mbox_lock_id;
-	} else if ((sync_flags & MBOX_SYNC_FORCE_SYNC) != 0) {
-		/* dirty offsets are broken and mbox is write-locked.
-		   sync it to update offsets. */
-		if (mbox_sync(mbox, sync_flags) < 0)
+		if (mbox_file_open_stream(mbox) < 0)
 			return -1;
-	}
 
-	if (mbox_file_open_stream(mbox) < 0)
-		return -1;
-
-	ret = mbox_file_seek(mbox, mail->trans->trans_view,
-			     mail->mail.mail.seq, &deleted);
-	if (ret < 0) {
-		if (deleted) {
-			mail->mail.mail.expunged = TRUE;
-			return 0;
+		ret = mbox_file_seek(mbox, mail->trans->trans_view,
+				     mail->mail.mail.seq, &deleted);
+		if (ret > 0) {
+			/* success */
+			break;
+		}
+		if (ret < 0) {
+			if (deleted) {
+				mail->mail.mail.expunged = TRUE;
+				return 0;
+			}
+			return -1;
 		}
-		return -1;
-	}
 
-	if (ret == 0) {
 		/* we'll need to re-sync it completely */
-                mbox_prepare_resync(mail);
+		mbox_prepare_resync(mail);
 		sync_flags |= MBOX_SYNC_UNDIRTY | MBOX_SYNC_FORCE_SYNC;
-		goto __again;
 	}
-
+	if (ret == 0) {
+		mail_storage_set_critical(STORAGE(mbox->storage),
+			"Losing sync for mail uid=%u in mbox file %s",
+			mail->mail.mail.uid, mbox->path);
+	}
 	return 1;
 }