dovecot-2.2: dsync: If locking fails, fail instead of continuing.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/adb9857a3879
changeset: 15816:adb9857a3879
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Feb 17 08:50:18 2013 +0200
description:
dsync: If locking fails, fail instead of continuing.

diffstat:

 src/doveadm/dsync/dsync-brain.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r e7aabd79c9d5 -r adb9857a3879 src/doveadm/dsync/dsync-brain.c
--- a/src/doveadm/dsync/dsync-brain.c	Sun Feb 17 07:05:08 2013 +0200
+++ b/src/doveadm/dsync/dsync-brain.c	Sun Feb 17 08:50:18 2013 +0200
@@ -259,8 +259,10 @@
 		return FALSE;
 
 	if (brain->lock_timeout > 0) {
-		if (dsync_brain_lock(brain, ibc_set->hostname) < 0)
+		if (dsync_brain_lock(brain, ibc_set->hostname) < 0) {
+			brain->failed = TRUE;
 			return FALSE;
+		}
 	}
 
 	brain->state = brain->sync_type == DSYNC_BRAIN_SYNC_TYPE_STATE ?
@@ -280,8 +282,10 @@
 
 	if (ibc_set->lock_timeout > 0) {
 		brain->lock_timeout = ibc_set->lock_timeout;
-		if (dsync_brain_lock(brain, ibc_set->hostname) < 0)
+		if (dsync_brain_lock(brain, ibc_set->hostname) < 0) {
+			brain->failed = TRUE;
 			return FALSE;
+		}
 	}
 
 	if (ibc_set->sync_ns_prefix != NULL) {