From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 14 Sep 2017 08:57:27 +0000 (+0300)
Subject: doveadm director ring remove: Wait ring sync before and after removal
X-Git-Tag: 2.3.0.rc1~1022
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30089b563dd385f9b18835af2c5a47de2b560660;p=thirdparty%2Fdovecot%2Fcore.git

doveadm director ring remove: Wait ring sync before and after removal

This helps mainly with automated tests.
---

diff --git a/src/director/director.c b/src/director/director.c
index a03f3b98e6..a1329fa408 100644
--- a/src/director/director.c
+++ b/src/director/director.c
@@ -545,6 +545,7 @@ void director_ring_remove(struct director_host *removed_host,
 			      removed_host->port);
 	director_update_send_version(dir, src,
 				     DIRECTOR_VERSION_RING_REMOVE, cmd);
+	director_sync(dir);
 }
 
 static void
diff --git a/src/director/doveadm-connection.c b/src/director/doveadm-connection.c
index 3ab8a3eca0..9485c18acd 100644
--- a/src/director/doveadm-connection.c
+++ b/src/director/doveadm-connection.c
@@ -289,7 +289,7 @@ doveadm_cmd_director_remove(struct doveadm_connection *conn,
 		director_ring_remove(host, conn->dir->self_host);
 		o_stream_nsend(conn->output, "OK\n", 3);
 	}
-	return DOVEADM_DIRECTOR_CMD_RET_OK;
+	return DOVEADM_DIRECTOR_CMD_RET_RING_SYNC_OK;
 }
 
 static enum doveadm_director_cmd_ret