From 81337cc43b783faa7e6c5bf9fea4feab57ab3038 Mon Sep 17 00:00:00 2001 From: "gary.liu" Date: Fri, 8 Nov 2024 08:01:55 +0000 Subject: [PATCH 1/2] libnetwork: resolve: use structured logs for DNS error Signed-off-by: gary.liu --- ...ve-use-structured-logs-for-DNS-error.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 0008-libnetwork-resolve-use-structured-logs-for-DNS-error.patch diff --git a/0008-libnetwork-resolve-use-structured-logs-for-DNS-error.patch b/0008-libnetwork-resolve-use-structured-logs-for-DNS-error.patch new file mode 100644 index 0000000..92aef4e --- /dev/null +++ b/0008-libnetwork-resolve-use-structured-logs-for-DNS-error.patch @@ -0,0 +1,40 @@ +From d9e082ff54e685a08b193ccb67c5fa3c0a205f3f Mon Sep 17 00:00:00 2001 +From: Sebastiaan van Stijn +Date: Tue, 20 Feb 2024 17:01:06 +0100 +Subject: [PATCH] libnetwork: resolve: use structured logs for DNS error + +I noticed that this log didn't use structured logs; + + [resolver] failed to query DNS server: 10.115.11.146:53, query: ;google.com.\tIN\t A" error="read udp 172.19.0.2:46361->10.115.11.146:53: i/o timeout + [resolver] failed to query DNS server: 10.44.139.225:53, query: ;google.com.\tIN\t A" error="read udp 172.19.0.2:53991->10.44.139.225:53: i/o timeout + +But other logs did; + + DEBU[2024-02-20T15:48:51.026704088Z] [resolver] forwarding query client-addr="udp:172.19.0.2:39661" dns-server="udp:192.168.65.7:53" question=";google.com.\tIN\t A" + DEBU[2024-02-20T15:48:51.028331088Z] [resolver] forwarding query client-addr="udp:172.19.0.2:35163" dns-server="udp:192.168.65.7:53" question=";google.com.\tIN\t AAAA" + DEBU[2024-02-20T15:48:51.057329755Z] [resolver] received AAAA record "2a00:1450:400e:801::200e" for "google.com." from udp:192.168.65.7 + DEBU[2024-02-20T15:48:51.057666880Z] [resolver] received A record "142.251.36.14" for "google.com." from udp:192.168.65.7 + +As we're already constructing a logger with these fields, we may as well use it. + +Signed-off-by: Sebastiaan van Stijn +--- + libnetwork/resolver.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libnetwork/resolver.go b/libnetwork/resolver.go +index 9df2154499..816f00ad68 100644 +--- a/libnetwork/resolver.go ++++ b/libnetwork/resolver.go +@@ -576,7 +576,7 @@ func (r *Resolver) exchange(ctx context.Context, proto string, extDNS extDNSEntr + UDPSize: dns.MaxMsgSize, + }).ExchangeWithConn(query, &dns.Conn{Conn: extConn}) + if err != nil { +- r.log(ctx).WithError(err).Errorf("[resolver] failed to query DNS server: %s, query: %s", extConn.RemoteAddr().String(), query.Question[0].String()) ++ logger.WithError(err).Error("[resolver] failed to query external DNS server") + span.RecordError(err) + span.SetStatus(codes.Error, "ExchangeWithConn failed") + return nil +-- +2.43.0 + -- Gitee From 8966e24f992faa6513e46a41a2f1f0e7a0206a0c Mon Sep 17 00:00:00 2001 From: "gary.liu" Date: Fri, 8 Nov 2024 08:03:33 +0000 Subject: [PATCH 2/2] update moby.spec. Signed-off-by: gary.liu --- moby.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/moby.spec b/moby.spec index 7e8231c..468ccec 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: docker Version: 25.0.3 -Release: 14 +Release: 15 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com @@ -27,6 +27,7 @@ Patch0004: 0004-fix-docker-swarm-run-failed-for-loongarch64.patch Patch0005: 0005-CVE-2024-41110.patch Patch0006: 0006-tini.c-a-function-declaration-without-a-prototype-is.patch Patch0007: 0007-fix-libnetwork-osl-test-TestAddRemoveInterface.patch +Patch0008: 0008-libnetwork-resolve-use-structured-logs-for-DNS-error.patch Requires: %{name}-engine = %{version}-%{release} Requires: %{name}-client = %{version}-%{release} @@ -97,6 +98,7 @@ Docker client binary and related utilities %patch 0004 -p1 %patch 0005 -p1 %patch 0007 -p1 +%patch 0008 -p1 %setup -q -T -n %{_source_docker_init} -b 2 %patch 0006 -p1 @@ -199,6 +201,9 @@ fi %systemd_postun_with_restart docker.service %changelog +* Thu Nov 4 2024 liusiyuan - 25.0.3-15 +- DESC:libnetwork resolution - use structured logs for DNS error + * Thu Oct 31 2024 yaoguangzhong - 25.0.3-14 - DESC:backport upstream patch to fix libnetwork/osl test TestAddRemoveInterface -- Gitee