diff --git a/0011-backport-remove-head-rev-match-in-validateGotAtLeastOneProgressNotify.patch b/0011-backport-remove-head-rev-match-in-validateGotAtLeastOneProgressNotify.patch new file mode 100644 index 0000000000000000000000000000000000000000..b463797af6473b193d402e41c16f24110e2d353e --- /dev/null +++ b/0011-backport-remove-head-rev-match-in-validateGotAtLeastOneProgressNotify.patch @@ -0,0 +1,30 @@ +From cded6b0ac6292242c69d58190477a26886e0f65c Mon Sep 17 00:00:00 2001 +From: Siyuan Zhang +Date: Wed, 3 Jul 2024 09:03:54 -0700 +Subject: [PATCH] robustness: remove head rev match in + validateGotAtLeastOneProgressNotify + +Signed-off-by: Siyuan Zhang +--- + tests/robustness/watch.go | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/tests/robustness/watch.go b/tests/robustness/watch.go +index 45869446fbd..3da853f0078 100644 +--- a/tests/robustness/watch.go ++++ b/tests/robustness/watch.go +@@ -129,13 +129,11 @@ func validateGotAtLeastOneProgressNotify(t *testing.T, reports []report.ClientRe + external: + for _, r := range reports { + for _, op := range r.Watch { +- var lastHeadRevision int64 = 1 + for _, resp := range op.Responses { +- if resp.IsProgressNotify && resp.Revision == lastHeadRevision { ++ if resp.IsProgressNotify { + gotProgressNotify = true + break external + } +- lastHeadRevision = resp.Revision + } + } + } \ No newline at end of file diff --git a/etcd.spec b/etcd.spec index c33a6f8f498c1e7f47c7cf35d5827be5c033cf7e..334cdf1b1cb0ed47546e58a13619f7c6c1d58ec4 100644 --- a/etcd.spec +++ b/etcd.spec @@ -31,7 +31,7 @@ system.} %global gosupfiles integration/fixtures/* etcdserver/api/v2http/testdata/* Name: etcd -Release: 13 +Release: 14 Summary: Distributed reliable key-value store for the most critical data of a distributed system # Upstream license specification: Apache-2.0 @@ -54,6 +54,7 @@ Patch7: 0007-fix-CVE-2022-34038.patch Patch8: 0008-fix-CVE-2023-32082.patch Patch9: 0009-fix-CVE-2021-28235.patch Patch10: 0010-backport-Suppress-noisy-basic-auth-token-deletion-log.patch +Patch11: 0011-backport-remove-head-rev-match-in-validateGotAtLeastOneProgressNotify.patch BuildRequires: golang BuildRequires: python3-devel @@ -78,6 +79,7 @@ Requires(pre): shadow-utils %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %ifarch sw_64 %patch3 -p1 %endif @@ -166,6 +168,9 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog +* Wed Jul 17 2024 guojunding - 3.4.14-14 +- Remove head rev match in validateGotAtLeastOneProgressNotify + * Fri Jul 5 2024 guojunding - 3.4.14-13 - Suppress noisy basic auth token deletion log