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

Migration to dskit/ring #336

Merged
merged 18 commits into from
Oct 18, 2021
Merged

Migration to dskit/ring #336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fbdfaf9
WIP migration to dskit/ring
Oct 11, 2021
9bc56dc
Merge remote-tracking branch 'origin/main' into dskit-ring
aknuds1 Oct 12, 2021
63381af
Fix *_ring go file loggers. Update to dskit with new ring changes
Oct 12, 2021
6e368b6
Refactor tests to use ignore log lines, re-add pedantic registry
Oct 12, 2021
e9b2298
Cleanup imports for dskit ring
Oct 12, 2021
ec872bc
client straggler cleanup
Oct 12, 2021
24929fa
Update dskit
Oct 13, 2021
b598fde
Remove log message from numTokens
Oct 13, 2021
64aabda
Clean up linter issues, comment out weird code that fails for weird r…
Oct 13, 2021
b4240eb
Update dskit for the ring changes and un-comment check in test that i…
Oct 15, 2021
6bb5da8
formatting change for lifecycle_test
Oct 15, 2021
5448d48
Add ignored ring log message to prevent flakey test in TestMultitenan…
Oct 15, 2021
041d99e
Wrap basic lifecycler in the ruler
Oct 18, 2021
506dcd6
Merge remote-tracking branch 'origin/main' into dskit-ring
Oct 18, 2021
1d8088e
Ring module update
Oct 18, 2021
6aa6120
linter fixes
Oct 18, 2021
f61b104
remove kit/log from the mod and vendor file
Oct 18, 2021
27c4dd5
Update tests for go-kit/log changes
Oct 18, 2021
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 @@ -28,7 +28,7 @@ require (
github.com/golang/protobuf v1.5.2
github.com/golang/snappy v0.0.4
github.com/gorilla/mux v1.8.0
github.com/grafana/dskit v0.0.0-20211013141716-951b97c3811e
github.com/grafana/dskit v0.0.0-20211015163529-3a65fbdcfc45
github.com/hashicorp/go-hclog v0.12.2 // indirect
github.com/hashicorp/go-immutable-radix v1.2.0 // indirect
github.com/hashicorp/golang-lru v0.5.4
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 @@ -904,8 +904,8 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grafana/dskit v0.0.0-20210818123532-6645f87e9e12/go.mod h1:QaNAQaCSFOtG/NHf6Jd/zh67H25kkrVCq36U61Y2Mhw=
github.com/grafana/dskit v0.0.0-20210819132858-471020752967/go.mod h1:uF46UNN1/feB1egpq8UGbBBKvJjGgZauW7pcVbeFLLM=
github.com/grafana/dskit v0.0.0-20211013141716-951b97c3811e h1:fXjnswpsf5Frkmpd1DvJkdNkYOAaEYgk77qwWiXfYxc=
github.com/grafana/dskit v0.0.0-20211013141716-951b97c3811e/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM=
github.com/grafana/dskit v0.0.0-20211015163529-3a65fbdcfc45 h1:MnEo2iaFbjxfkSVc1+apEOnGTJJBnV96YFl3K7wIsss=
github.com/grafana/dskit v0.0.0-20211015163529-3a65fbdcfc45/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM=
github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 h1:xLuzPoOzdfNb/RF/IENCw+oLVdZB4G21VPhkHBgwSHY=
github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85/go.mod h1:crI9WX6p0IhrqB+DqIUHulRW853PaNFf7o4UprV//3I=
github.com/grafana/prometheus-private v0.0.0-20211011121551-62935a12417d h1:VHtBAm2LCCWGum9VXkL1+WJbE/LZ7jLe1bc1O4xQsaM=
Expand Down
8 changes: 4 additions & 4 deletions pkg/storegateway/gateway_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,10 @@ func TestStoreGateway_BlocksSyncWithDefaultSharding_RingTopologyChangedAfterScal
// store-gateways behaves with regards to blocks syncing while other replicas are JOINING.

// Wait until all the initial store-gateways sees all new store-gateways too.
// dstest.Poll(t, 22*time.Second, float64(numAllGateways*numInitialGateways), func() interface{} {
// metrics := initialRegistries.BuildMetricFamiliesPerUser()
// return metrics.GetSumOfGauges("cortex_ring_members")
// })
dstest.Poll(t, 11*time.Second, float64(numAllGateways*numInitialGateways), func() interface{} {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change from 5 seconds to 11 is worth calling out in the commit message.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And should be rendered unnecessary by grafana/dskit#107, I think.

metrics := initialRegistries.BuildMetricFamiliesPerUser()
return metrics.GetSumOfGauges("cortex_ring_members")
})

// We expect each block to be available for querying on at least 1 initial store-gateway.
for _, userID := range []string{"user-1", "user-2"} {
Expand Down
9 changes: 5 additions & 4 deletions vendor/github.com/grafana/dskit/ring/ring.go
View file
Open in desktop

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

10 changes: 10 additions & 0 deletions vendor/github.com/grafana/dskit/time/time.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.