Skip to content

Commit

Permalink
chore: Improve logging of jumphash server selector
Browse files Browse the repository at this point in the history
This commit adds the name of the server to the jumphash server selector
logging by adding the name of the server to make the log lines
distinguishable.

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
  • Loading branch information
chaudum committed Sep 30, 2024
1 parent 84788ad commit 4e7c3e5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/bloomgateway/client_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type AddressProvider interface {
}

func NewJumpHashClientPool(pool *client.Pool, dnsProvider AddressProvider, updateInterval time.Duration, logger log.Logger) *JumpHashClientPool {
selector := jumphash.DefaultSelector()
selector := jumphash.DefaultSelector("bloomgateway")
err := selector.SetServers(dnsProvider.Addresses()...)
if err != nil {
level.Warn(logger).Log("msg", "error updating servers", "err", err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/chunk/cache/memcached_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (cfg *MemcachedClientConfig) RegisterFlagsWithPrefix(prefix, description st
func NewMemcachedClient(cfg MemcachedClientConfig, name string, r prometheus.Registerer, logger log.Logger, metricsNamespace string) MemcachedClient {
var selector serverSelector
if cfg.ConsistentHash {
selector = jumphash.DefaultSelector()
selector = jumphash.DefaultSelector("memcached")
} else {
selector = &memcache.ServerList{}
}
Expand Down
9 changes: 6 additions & 3 deletions pkg/util/jumphash/memcached_client_selector.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
// with consistent DNS names where the naturally sorted order
// is predictable.
type Selector struct {
name string
mu sync.RWMutex
addrs []net.Addr
resolveUnixAddr UnixResolver
Expand All @@ -33,15 +34,17 @@ type UnixResolver func(network, address string) (*net.UnixAddr, error)

type TCPResolver func(network, address string) (*net.TCPAddr, error)

func NewSelector(resolveUnixAddr UnixResolver, resolveTCPAddr TCPResolver) *Selector {
func NewSelector(name string, resolveUnixAddr UnixResolver, resolveTCPAddr TCPResolver) *Selector {
return &Selector{
name: name,
resolveUnixAddr: resolveUnixAddr,
resolveTCPAddr: resolveTCPAddr,
}
}

func DefaultSelector() *Selector {
func DefaultSelector(name string) *Selector {
return &Selector{
name: name,
resolveUnixAddr: net.ResolveUnixAddr,
resolveTCPAddr: net.ResolveTCPAddr,
}
Expand Down Expand Up @@ -102,7 +105,7 @@ func (s *Selector) SetServers(servers ...string) error {
}
}

level.Debug(util_log.Logger).Log("msg", "updating memcached servers", "servers", strings.Join(addresses(naddrs), ","), "count", len(naddrs))
level.Debug(util_log.Logger).Log("msg", "updating servers", "name", s.name, "servers", strings.Join(addresses(naddrs), ","), "count", len(naddrs))

s.mu.Lock()
defer s.mu.Unlock()
Expand Down

0 comments on commit 4e7c3e5

Please sign in to comment.