Parse metadata outside of cluster.go

Move the calls for metadata decoding from the cluster
membership management loop to the main loop. This task
was not directly related to the cluster, and was adding
complexity, including the need for multierr structures.
This commit is contained in:
kaiyou
2020-05-06 19:27:21 +02:00
committed by Leo Antunes
parent 366f906d5d
commit 0e799d6074
4 changed files with 17 additions and 22 deletions

16
main.go
View File

@ -49,7 +49,7 @@ func main() {
wg.assignOverlayAddr((*net.IPNet)(config.OverlayNet), cluster.localName)
cluster.update()
nodec, errc := cluster.members() // avoid deadlocks by starting before join
nodec := cluster.members() // avoid deadlocks by starting before join
if err := backoff.RetryNotify(
func() error { return cluster.join(config.Join) },
backoff.NewExponentialBackOff(),
@ -65,9 +65,17 @@ func main() {
logrus.Debug("waiting for cluster events")
for {
select {
case nodes := <-nodec:
case rawNodes := <-nodec:
logrus.Info("cluster members:\n")
for _, node := range nodes {
nodes := make([]node, 0)
for _, node := range rawNodes {
meta, err := decodeNodeMeta(node.Meta)
if err != nil {
logrus.Warnf("\t addr: %s, could not decode metadata", node.Addr)
continue
}
node.nodeMeta = meta
nodes = append(nodes, node)
logrus.Infof("\taddr: %s, overlay: %s, pubkey: %s", node.Addr, node.OverlayAddr, node.PubKey)
}
if err := wg.setUpInterface(nodes); err != nil {
@ -79,8 +87,6 @@ func main() {
logrus.WithError(err).Error("could not write hosts entries")
}
}
case errs := <-errc:
logrus.WithError(errs).Error("could not receive node info")
case <-incomingSigs:
logrus.Info("terminating...")
cluster.leave()