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

This helps mainly with automated tests.
dovecot · Oct 5, 2017 · 28a9595 · 28a9595
1 parent a912765
commit 28a9595
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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