Skip to content
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

Jump to bottom

tests(distributor): improve checks during ha_tracker sync cache on startup #9905

Merged
merged 2 commits into from
Nov 18, 2024
Merged

tests(distributor): improve checks during ha_tracker sync cache on startup #9905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63c9ec6
tests: create a KV.Client to count calls of the GET and LIST operatio…
NickAnge Nov 14, 2024
7febb63
tests: use New MockCountingClient from dskit
NickAnge Nov 15, 2024
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/golang/snappy v0.0.4
github.com/google/gopacket v1.1.19
github.com/gorilla/mux v1.8.1
github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/json-iterator/go v1.1.12
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,8 +1260,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
github.com/grafana/alerting v0.0.0-20241021123319-be61d61f71e7 h1:lsM/QscEX+ZDIJm48ynQscH+msETyGYV6ug8L4f2DtM=
github.com/grafana/alerting v0.0.0-20241021123319-be61d61f71e7/go.mod h1:QsnoKX/iYZxA4Cv+H+wC7uxutBD8qi8ZW5UJvD2TYmU=
github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 h1:IR+UNYHqaU31t8/TArJk8K/GlDwOyxMpGNkWCXeZ28g=
github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9 h1:Dx7+6aU/fhwD2vkMr0PUcyxGat1sjUssHAKQKaS7sDM=
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc h1:BW+LjKJDz0So5LI8UZfW5neWeKpSkWqhmGjQFzcFfLM=
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
github.com/grafana/franz-go v0.0.0-20241009100846-782ba1442937 h1:fwwnG/NcygoS6XbAaEyK2QzMXI/BZIEJvQ3CD+7XZm8=
Expand Down
26 changes: 20 additions & 6 deletions pkg/distributor/ha_tracker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ func checkReplicaTimestamp(t *testing.T, duration time.Duration, c *haTracker, u

func TestHATrackerCacheSyncOnStart(t *testing.T) {
const cluster = "c1"
const replica = "r1"
const replicaOne = "r1"
const replicaTwo = "r2"

var c *haTracker
var err error
Expand All @@ -82,28 +83,35 @@ func TestHATrackerCacheSyncOnStart(t *testing.T) {
kvStore, closer := consul.NewInMemoryClient(codec, log.NewNopLogger(), nil)
t.Cleanup(func() { assert.NoError(t, closer.Close()) })

mock := kv.PrefixClient(kvStore, "prefix")
mockCountingClient := kv.NewMockCountingClient(kvStore)
c, err = newHATracker(HATrackerConfig{
EnableHATracker: true,
KVStore: kv.Config{Mock: mock},
KVStore: kv.Config{Mock: mockCountingClient},
UpdateTimeout: time.Millisecond * 100,
UpdateTimeoutJitterMax: 0,
FailoverTimeout: time.Millisecond * 2,
}, trackerLimits{maxClusters: 100}, nil, log.NewNopLogger())
require.NoError(t, err)
require.NoError(t, services.StartAndAwaitRunning(context.Background(), c))

// KV Store empty: The sync should try fetching the Keys only
// client.List: 1
// client.Get: 0
assert.Equal(t, 1, int(mockCountingClient.ListCalls.Load()))
assert.Equal(t, 0, int(mockCountingClient.GetCalls.Load()))

now = time.Now()
err = c.checkReplica(context.Background(), "user", cluster, replica, now)
err = c.checkReplica(context.Background(), "user", cluster, replicaOne, now)
assert.NoError(t, err)

err = services.StopAndAwaitTerminated(context.Background(), c)
assert.NoError(t, err)

replicaTwo := "r2"
// Initializing a New Client to set calls to zero
mockCountingClient = kv.NewMockCountingClient(kvStore)
c, err = newHATracker(HATrackerConfig{
EnableHATracker: true,
KVStore: kv.Config{Mock: mock},
KVStore: kv.Config{Mock: mockCountingClient},
UpdateTimeout: time.Millisecond * 100,
UpdateTimeoutJitterMax: 0,
FailoverTimeout: time.Millisecond * 2,
Expand All @@ -112,6 +120,12 @@ func TestHATrackerCacheSyncOnStart(t *testing.T) {
require.NoError(t, services.StartAndAwaitRunning(context.Background(), c))
t.Cleanup(func() { assert.NoError(t, services.StopAndAwaitTerminated(context.Background(), c)) })

// KV Store has one entry: The sync should try fetching the Keys and updating the cache
// client.List: 1
// client.Get: 1
assert.Equal(t, 1, int(mockCountingClient.ListCalls.Load()))
assert.Equal(t, 1, int(mockCountingClient.GetCalls.Load()))

now = time.Now()
err = c.checkReplica(context.Background(), "user", cluster, replicaTwo, now)
assert.Error(t, err)
Expand Down
61 changes: 61 additions & 0 deletions vendor/github.com/grafana/dskit/kv/mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading