From 346e92a91dd2e9d7449953e4d6edf1e9004c0833 Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Fri, 2 Feb 2018 15:58:08 -0600 Subject: [PATCH] return 0 values for errors. panic on unmarshal node meta data --- cluster.go | 6 +++--- gossip/gossip.go | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cluster.go b/cluster.go index d531c90d6..76642107b 100644 --- a/cluster.go +++ b/cluster.go @@ -633,12 +633,12 @@ func (c *Cluster) diff(other *Cluster) (action string, nodeID string, err error) lenTo := len(other.Nodes) // Determine if a node is being added or removed. if lenFrom == lenTo { - return action, nodeID, errors.New("clusters are the same size") + return "", "", errors.New("clusters are the same size") } if lenFrom < lenTo { // Adding a node. if lenTo-lenFrom > 1 { - return action, nodeID, errors.New("adding more than one node at a time is not supported") + return "", "", errors.New("adding more than one node at a time is not supported") } action = ResizeJobActionAdd // Determine the node ID that is being added. @@ -651,7 +651,7 @@ func (c *Cluster) diff(other *Cluster) (action string, nodeID string, err error) } else if lenFrom > lenTo { // Removing a node. if lenFrom-lenTo > 1 { - return action, nodeID, errors.New("removing more than one node at a time is not supported") + return "", "", errors.New("removing more than one node at a time is not supported") } action = ResizeJobActionRemove // Determine the node ID that is being removed. diff --git a/gossip/gossip.go b/gossip/gossip.go index d0868be92..acfad66a1 100644 --- a/gossip/gossip.go +++ b/gossip/gossip.go @@ -384,8 +384,7 @@ func (g *GossipEventReceiver) listen() { // Get the node from the event.Node meta data. var n internal.Node if err := proto.Unmarshal(e.Node.Meta, &n); err != nil { - // TODO: consider logging error - continue + panic("failed to unmarshal event node meta data") } node := pilosa.DecodeNode(&n)