Skip to content

Add rand to sparse requests for rejoin memberlist cluster #4747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2022
Merged

Add rand to sparse requests for rejoin memberlist cluster #4747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* [ENHANCEMENT] Blocks storage: Add `-blocks-storage.azure.http.*`, `-alertmanager-storage.azure.http.*`, and `-ruler-storage.azure.http.*` to configure the Azure storage client. #4581
* [ENHANCEMENT] Optimise memberlist receive path when used as a backing store for rings with a large number of members. #4601
* [ENHANCEMENT] Add length and limit to labelNameTooLongError and labelValueTooLongError #4595
* [ENHANCEMENT] Add jitter to rejoinInterval. #4747
* [BUGFIX] AlertManager: remove stale template files. #4495
* [BUGFIX] Distributor: fix bug in query-exemplar where some results would get dropped. #4583
* [BUGFIX] Update Thanos dependency: compactor tracing support, azure blocks storage memory fix. #4585
Expand Down
30 changes: 20 additions & 10 deletions pkg/ring/kv/memberlist/memberlist_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"flag"
"fmt"
"math"
mathrand "math/rand"
"strings"
"sync"
"time"
Expand Down Expand Up @@ -462,6 +463,12 @@ func (m *KV) running(ctx context.Context) error {
var tickerChan <-chan time.Time
if m.cfg.RejoinInterval > 0 && len(m.cfg.JoinMembers) > 0 {
t := time.NewTicker(m.cfg.RejoinInterval)
t.Stop()
time.AfterFunc(time.Duration(uint64(mathrand.Int63())%uint64(m.cfg.RejoinInterval)), func() {
m.rejoinMemberlist(ctx)

t.Reset(m.cfg.RejoinInterval)
})
defer t.Stop()

tickerChan = t.C
Expand All @@ -470,22 +477,25 @@ func (m *KV) running(ctx context.Context) error {
for {
select {
case <-tickerChan:
members := m.discoverMembers(ctx, m.cfg.JoinMembers)

reached, err := m.memberlist.Join(members)
if err == nil {
level.Info(m.logger).Log("msg", "re-joined memberlist cluster", "reached_nodes", reached)
} else {
// Don't report error from rejoin, otherwise KV service would be stopped completely.
level.Warn(m.logger).Log("msg", "re-joining memberlist cluster failed", "err", err)
}

m.rejoinMemberlist(ctx)
case <-ctx.Done():
return nil
}
}
}

func (m *KV) rejoinMemberlist(ctx context.Context) {
members := m.discoverMembers(ctx, m.cfg.JoinMembers)

reached, err := m.memberlist.Join(members)
if err == nil {
level.Info(m.logger).Log("msg", "re-joined memberlist cluster", "reached_nodes", reached)
} else {
// Don't report error from rejoin, otherwise KV service would be stopped completely.
level.Warn(m.logger).Log("msg", "re-joining memberlist cluster failed", "err", err)
}
}

// GetCodec returns codec for given ID or nil.
func (m *KV) GetCodec(codecID string) codec.Codec {
return m.codecs[codecID]
Expand Down