store: Tiny logging improvements. (#370)

Signed-off-by: Bartek Plotka <[email protected]>

cmd/thanos/query.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"math"
 	"net"
 	"net/http"
@@ -143,6 +144,10 @@ func runQuery(
 ) error {
 	var staticSpecs []query.StoreSpec
 	for _, addr := range storeAddrs {
+		if addr == "" {
+			return errors.New("static store address cannot be empty")
+		}
+
 		staticSpecs = append(staticSpecs, query.NewGRPCStoreSpec(addr))
 	}
 	var (
@@ -153,6 +158,11 @@ func runQuery(
 				specs = append(staticSpecs)
 
 				for id, ps := range peer.PeerStates(cluster.PeerTypesStoreAPIs()...) {
+					if ps.StoreAPIAddr == "" {
+						level.Error(logger).Log("msg", "Gossip found peer that propagates empty address, ignoring.", "lset", fmt.Sprintf("%v", ps.Metadata.Labels))
+						continue
+					}
+
 					specs = append(specs, &gossipSpec{id: id, addr: ps.StoreAPIAddr, peer: peer})
 				}
 				return specs

cmd/thanos/store.go

@@ -151,10 +151,13 @@ func runStore(
 		ctx, cancel := context.WithCancel(context.Background())
 		g.Add(func() error {
 			// New gossip cluster.
-			if err := peer.Join(cluster.PeerTypeStore, cluster.PeerMetadata{
-				MinTime: math.MinInt64,
-				MaxTime: math.MaxInt64,
-			}); err != nil {
+			if err := peer.Join(
+				cluster.PeerTypeStore,
+				cluster.PeerMetadata{
+					MinTime: math.MinInt64,
+					MaxTime: math.MaxInt64,
+				},
+			); err != nil {
 				return errors.Wrap(err, "join cluster")
 			}
 

pkg/cluster/cluster.go

@@ -187,7 +187,7 @@ func (p *Peer) Join(peerType PeerType, initialMetadata PeerMetadata) error {
 	}
 
 	n, _ := ml.Join(p.knownPeers)
-	level.Debug(p.logger).Log("msg", "joined cluster", "peers", n, "peerType", peerType)
+	level.Debug(p.logger).Log("msg", "joined cluster", "peerType", peerType)
 
 	if n > 0 {
 		go warnIfAlone(p.logger, 10*time.Second, p.stopc, ml.NumMembers)
@@ -204,6 +204,7 @@ func (p *Peer) Join(peerType PeerType, initialMetadata PeerMetadata) error {
 		QueryAPIAddr: p.advertiseQueryAPIAddress,
 		Metadata:     initialMetadata,
 	})
+
 	return nil
 }
 
@@ -302,7 +303,6 @@ func (p *Peer) PeerStates(types ...PeerType) map[string]PeerState {
 			ps[o.Name] = os
 			continue
 		}
-
 		for _, t := range types {
 			if os.Type == t {
 				ps[o.Name] = os