From 1f93662b3e7db6e9e1efbd241dca3e03d256093f Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 15 Nov 2017 17:52:27 +0100 Subject: [PATCH] cluster: get first peerset from configuration make sure we save a new config if the new peerset is different than the one in the configuration at boot. Hopefully this fixes a race condition in PeerAdd test License: MIT Signed-off-by: Hector Sanjuan --- cluster.go | 6 +----- peer_manager_test.go | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cluster.go b/cluster.go index 4a4f44f3..9ba904ac 100644 --- a/cluster.go +++ b/cluster.go @@ -344,11 +344,7 @@ func (c *Cluster) alertsHandler() { func (c *Cluster) watchPeers() { // TODO: Config option? ticker := time.NewTicker(5 * time.Second) - var lastPeers []peer.ID - lastPeers, err := c.consensus.Peers() - if err != nil { - logger.Error("starting to watch peers", err) - } + lastPeers := peersFromMultiaddrs(c.config.Peers) for { select { diff --git a/peer_manager_test.go b/peer_manager_test.go index 2e0a4c9e..1abc1666 100644 --- a/peer_manager_test.go +++ b/peer_manager_test.go @@ -92,7 +92,8 @@ func TestClustersPeerAdd(t *testing.T) { // This only works because each peer only has one multiaddress // (localhost) if len(c.config.Peers) != nClusters-1 { - t.Error("expected different cluster peers in the configuration") + t.Error(c.config.Peers) + t.Errorf("%s: expected different cluster peers in the configuration", c.id) } for _, peer := range c.config.Peers {