From 28a95958315a37194d8284831076580a19834590 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 14 Sep 2017 11:57:27 +0300 Subject: [PATCH] doveadm director ring remove: Wait ring sync before and after removal This helps mainly with automated tests. --- src/director/director.c | 1 + src/director/doveadm-connection.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/director/director.c b/src/director/director.c index b1ccb5fa24..561e3fe705 100644 --- a/src/director/director.c +++ b/src/director/director.c @@ -548,6 +548,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 3c19e81cd4..7d88ca9689 100644 --- a/src/director/doveadm-connection.c +++ b/src/director/doveadm-connection.c @@ -291,7 +291,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