diff --git a/0004-backport-Suppress-noisy-basic-auth-token-deletion-log.patch b/0004-backport-Suppress-noisy-basic-auth-token-deletion-log.patch new file mode 100644 index 0000000000000000000000000000000000000000..1bdf4cd9bff1680520ec6e3794733818d9123e6f --- /dev/null +++ b/0004-backport-Suppress-noisy-basic-auth-token-deletion-log.patch @@ -0,0 +1,32 @@ +From 0a960a272d46fa3c1d4929543efdfb673f47d37f Mon Sep 17 00:00:00 2001 +From: Ahmet Alp Balkan +Date: Fri, 28 Jun 2024 12:10:04 -0700 +Subject: [PATCH] Suppress noisy basic auth token deletion log + +Right now the basic auth tokens that are deleted after `--auth-token-ttl` +cause info-level logs to be emitted. Change this to debug. This helps with +the issue at #18244 where calling `/readyz` frequently pollutes the etcd server +logs with this log message. + +Fixes #18244. + +Signed-off-by: Ahmet Alp Balkan +--- + auth/simple_token.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/auth/simple_token.go b/auth/simple_token.go +index a9dc5b7..364aba2 100644 +--- a/auth/simple_token.go ++++ b/auth/simple_token.go +@@ -166,7 +166,7 @@ func (t *tokenSimple) enable() { + delf := func(tk string) { + if username, ok := t.simpleTokens[tk]; ok { + if t.lg != nil { +- t.lg.Info( ++ t.lg.Debug( + "deleted a simple token", + zap.String("user-name", username), + zap.String("token", tk), +-- +2.9.3.windows.1 \ No newline at end of file diff --git a/etcd.spec b/etcd.spec index cf963c4e36e3a45fcee4b1f2b20e3e220f52c82e..b73cda5745f8791e3463c677279ead65fa329bef 100644 --- a/etcd.spec +++ b/etcd.spec @@ -31,7 +31,7 @@ system.} %global gosupfiles integration/fixtures/* etcdserver/api/v2http/testdata/* Name: etcd -Release: 5 +Release: 6 Summary: Distributed reliable key-value store for the most critical data of a distributed system # Upstream license specification: Apache-2.0 @@ -47,7 +47,7 @@ Source10: genmanpages.sh Patch1: 0001-Convert-int-to-string-using-strconv.Itoa.patch Patch2: 0002-Etcd-on-unsupported-platform-without-ETCD_UNSUPPORTED_ARCH=arm64-set.patch Patch3: 0003-etcd-3.4.14-sw.patch - +Patch4: 0004-backport-Suppress-noisy-basic-auth-token-deletion-log.patch BuildRequires: golang BuildRequires: python3-devel %{?systemd_requires} @@ -67,6 +67,7 @@ Requires(pre): shadow-utils %ifarch sw_64 %patch3 -p1 %endif +%patch4 -p1 # For compatibility cp -aR etcdserver/api/snap snap cp -aR etcdserver/api/membership etcdserver/membership @@ -152,6 +153,9 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog +* Wed Jul 17 2024 guojunding - 3.4.14-6 +- Suppress noisy basic auth token deletion log + * Wed Oct 19 2022 wuzx - 3.4.14-5 - add sw64 patch