From 6c85fc7ac7bd2ac70aaf097b5bfd7dc2f0cd6346 Mon Sep 17 00:00:00 2001 From: clyang82 Date: Wed, 4 Aug 2021 14:51:16 +0800 Subject: [PATCH 1/3] Switch to use Miekg by default Signed-off-by: clyang82 --- cmd/thanos/query.go | 2 +- pkg/cacheutil/memcached_client.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/thanos/query.go b/cmd/thanos/query.go index ac971b7a97..63fda2e53a 100644 --- a/cmd/thanos/query.go +++ b/cmd/thanos/query.go @@ -127,7 +127,7 @@ func registerQuery(app *extkingpin.App) { Default("30s")) dnsSDResolver := cmd.Flag("store.sd-dns-resolver", fmt.Sprintf("Resolver to use. Possible options: [%s, %s]", dns.GolangResolverType, dns.MiekgdnsResolverType)). - Default(string(dns.GolangResolverType)).Hidden().String() + Default(string(dns.MiekgdnsResolverType)).Hidden().String() unhealthyStoreTimeout := extkingpin.ModelDuration(cmd.Flag("store.unhealthy-timeout", "Timeout before an unhealthy store is cleaned from the store UI page.").Default("5m")) diff --git a/pkg/cacheutil/memcached_client.go b/pkg/cacheutil/memcached_client.go index 445138b3e6..02059e8e69 100644 --- a/pkg/cacheutil/memcached_client.go +++ b/pkg/cacheutil/memcached_client.go @@ -247,7 +247,7 @@ func newMemcachedClient( addressProvider = dns.NewProvider( logger, extprom.WrapRegistererWithPrefix("thanos_memcached_", reg), - dns.GolangResolverType, + dns.MiekgdnsResolverType, ) } From 71493190e9f55017a3ca3abbb70de6ae9abb012f Mon Sep 17 00:00:00 2001 From: clyang82 Date: Wed, 4 Aug 2021 14:57:49 +0800 Subject: [PATCH 2/3] Update changelog.md Signed-off-by: clyang82 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b88a66a1f8..72e183cbe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#4468](https://github.com/thanos-io/thanos/pull/4468) Rule: Fix temporary rule filename composition issue. - [#4476](https://github.com/thanos-io/thanos/pull/4476) UI: fix incorrect html escape sequence used for '>' symbol. +- [#4519](https://github.com/thanos-io/thanos/pull/4519) Store: fix cannot unmarshal DNS message errors. ### Changed From e039c8aeda49558ad3aa80db182f494912e6d11a Mon Sep 17 00:00:00 2001 From: clyang82 Date: Wed, 4 Aug 2021 22:32:10 +0800 Subject: [PATCH 3/3] Address review comments Signed-off-by: clyang82 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72e183cbe7..2dd03a60d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,9 +19,9 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#4468](https://github.com/thanos-io/thanos/pull/4468) Rule: Fix temporary rule filename composition issue. - [#4476](https://github.com/thanos-io/thanos/pull/4476) UI: fix incorrect html escape sequence used for '>' symbol. -- [#4519](https://github.com/thanos-io/thanos/pull/4519) Store: fix cannot unmarshal DNS message errors. ### Changed +- [#4519](https://github.com/thanos-io/thanos/pull/4519) Query: switch to miekgdns DNS resolver as the default one. ## [v0.22.0](https://github.com/thanos-io/thanos/tree/release-0.22) - 2021.07.22