changeset 22559:29e61d343a60

doveadm director ring remove: Wait ring sync before and after removal This helps mainly with automated tests.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Thu, 14 Sep 2017 11:57:27 +0300
parents a9c51256847e
children 9a300e778b20
files src/director/director.c src/director/doveadm-connection.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/director/director.c	Tue Oct 03 14:51:16 2017 +0300
+++ b/src/director/director.c	Thu Sep 14 11:57:27 2017 +0300
@@ -548,6 +548,7 @@
 			      removed_host->port);
 	director_update_send_version(dir, src,
 				     DIRECTOR_VERSION_RING_REMOVE, cmd);
+	director_sync(dir);
 }
 
 static void
--- a/src/director/doveadm-connection.c	Tue Oct 03 14:51:16 2017 +0300
+++ b/src/director/doveadm-connection.c	Thu Sep 14 11:57:27 2017 +0300
@@ -291,7 +291,7 @@
 		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