Skip to content

Commit

Permalink
Ring member refresh log improvements (#6361)
Browse files Browse the repository at this point in the history
  • Loading branch information
taylanisikdemir authored Oct 15, 2024
1 parent 084464e commit 6d16588
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions common/membership/hashring.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,7 @@ func (r *ring) notifySubscribers(msg ChangedEvent) {
}

// Unsubscribe removes subscriber
func (r *ring) Unsubscribe(
name string,
) error {
func (r *ring) Unsubscribe(name string) error {
r.subscribers.Lock()
defer r.subscribers.Unlock()
delete(r.subscribers.keys, name)
Expand Down Expand Up @@ -254,6 +252,7 @@ func (r *ring) Members() []HostInfo {
func (r *ring) refresh() error {
if r.members.refreshed.After(r.timeSource.Now().Add(-minRefreshInternal)) {
// refreshed too frequently
r.logger.Debug("refresh skipped, refreshed too frequently")
return nil
}

Expand All @@ -272,7 +271,9 @@ func (r *ring) refresh() error {
ring := emptyHashring()
ring.AddMembers(castToMembers(members)...)
r.value.Store(ring)
r.logger.Info("refreshed ring members", tag.Value(members))
// sort members for deterministic order in the logs
sort.Slice(members, func(i, j int) bool { return members[i].addr < members[j].addr })
r.logger.Info("refreshed ring members", tag.Value(members), tag.Counter(len(members)), tag.Service(r.service))

r.updateMembersMap(newMembersMap)

Expand Down

0 comments on commit 6d16588

Please sign in to comment.