Skip to content

Commit 776c0b3

Browse files
authored
cache: ignore non-SRV responses during service discovery (#13203)
Backport of #13194 When discovering cache servers using `SRV` queries, sometimes DNS servers return A or AAAA records. Change our resolver to match the behavior of the built-in go resolver and ignore any non-SRV responses. Fixes #12713 Pulls in grafana/dskit#775 Signed-off-by: Nick Pillitteri <[email protected]>
1 parent 62b8bf5 commit 776c0b3

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## main / unreleased
44

5+
* [BUGFIX] Memcached: Ignore invalid responses when discovering cache servers using `dnssrv+` or `dnssrvnoa+` service discovery prefixes. #13203
6+
57
## 3.0.0-rc.1
68

79
### Jsonnet

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/golang/snappy v1.0.0
1818
github.com/google/gopacket v1.1.19
1919
github.com/gorilla/mux v1.8.1
20-
github.com/grafana/dskit v0.0.0-20251010193112-965b207c61b8
20+
github.com/grafana/dskit v0.0.0-20251028171531-a4bfa505f5e9
2121
github.com/grafana/e2e v0.1.2-0.20250825134630-3cea6f657739
2222
github.com/hashicorp/golang-lru v1.0.2 // indirect
2323
github.com/influxdata/influxdb/v2 v2.7.12

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,8 +561,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
561561
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
562562
github.com/grafana/alerting v0.0.0-20251002141545-d513d62d3210 h1:R4+ks/StOXvv+j8U7J+WQXqpa0e5bLZKFac9y20xeck=
563563
github.com/grafana/alerting v0.0.0-20251002141545-d513d62d3210/go.mod h1:VGjS5gDwWEADPP6pF/drqLxEImgeuHlEW5u8E5EfIrM=
564-
github.com/grafana/dskit v0.0.0-20251010193112-965b207c61b8 h1:60HJvGdtHhS+o1RCaYuLNANkATpkLccUI252L930zyg=
565-
github.com/grafana/dskit v0.0.0-20251010193112-965b207c61b8/go.mod h1:8AGVTqx49L8iYNAW6ls2n3+li4v70nenYr74sBsLKMk=
564+
github.com/grafana/dskit v0.0.0-20251028171531-a4bfa505f5e9 h1:r2yVAmj1eYGbViQUoZtSzQl9vXOJvAOV/GVtS8PVXzg=
565+
github.com/grafana/dskit v0.0.0-20251028171531-a4bfa505f5e9/go.mod h1:8AGVTqx49L8iYNAW6ls2n3+li4v70nenYr74sBsLKMk=
566566
github.com/grafana/e2e v0.1.2-0.20250825134630-3cea6f657739 h1:74hHXvOG42Y87T7jO7naPB5sZpwO3TDGTFiUL48s2Yc=
567567
github.com/grafana/e2e v0.1.2-0.20250825134630-3cea6f657739/go.mod h1:9bciABa7gW4B3t12C9vpgk54NeeoOZ+1DLsUnOAf+8Y=
568568
github.com/grafana/goautoneg v0.0.0-20240607115440-f335c04c58ce h1:WI1olbgS+sEl77qxEYbmt9TgRUz7iLqmjh8lYPpGlKQ=

vendor/github.com/grafana/dskit/dns/miekgdns/resolver.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)