Etcd upversion to 3.4.36

This change updates etcd version to 3.4.36.

The patch 0001-Increate-health-check-timeout.patch is dropped
with this change. Originally, the patch increased /health api
timeout from 1 second to 5 seconds. With etcd API 3, the new
timeout for /health API is now 5+ seconds. Just for the reference,
https://github.com/etcd-io/etcd/blob/v3.5.20/server/etcdserver/api/etcdhttp/health.go#L257
and
https://github.com/etcd-io/etcd/blob/v3.5.20/server/config/config.go#L314
The default API used in etcd 3.4 is API version 3. The only place
where API version 2 is still used in StarlingX will be updated to
use API version 3 in a different change.

Test Plan:
PASS: AIO-SX fresh installs with k8s versions 1.29, 1.30, 1.31
      successful. System healthy. No alarms. Kubernetes cluster
      healthy.
PASS: AIO-SX kubernetes upgrade successful from 1.29 to 1.30.

Story: 2011413
Task: 51996

Change-Id: Ibcbc2b46bcd6389d9d0de02cfb53a770835cf7e8
Signed-off-by: Kaustubh Dhokte <kaustubh.dhokte@windriver.com>
This commit is contained in:
Kaustubh Dhokte 2025-04-14 22:54:12 +00:00
parent c1861c3502
commit de227f30ba
8 changed files with 17 additions and 51 deletions

View File

@ -1,3 +1,9 @@
etcd (3.4.36-1) unstable; urgency=medium
* Updated for stx debian packaging
-- Kaustubh Dhokte <kaustubh.dhokte@windriver.com> Tue, 08 Apr 2025 16:41:53 +0000
etcd (3.4.27-1) unstable; urgency=medium
* Updated for stx debian packaging

View File

@ -1 +1 @@
usr/bin/etcdctl
etcdctl usr/bin/

View File

@ -1 +1 @@
usr/bin/etcd
etcd usr/bin/

View File

@ -1 +0,0 @@
/usr/share/gocode/src

View File

@ -1,32 +0,0 @@
From ec992b6080f5fff7545a2d5026f444674ae1b0f1 Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Fri, 19 Apr 2024 11:28:39 -0400
Subject: [PATCH 1/1] Increate health check timeout
Under high load, the /health check QGET times out occasionally.
This change increase the timeout value to 5s.
Signed-off-by: Andy Ning <andy.ning@windriver.com>
---
etcdserver/api/etcdhttp/metrics.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go
index e5c062e..d12ead0 100644
--- a/etcdserver/api/etcdhttp/metrics.go
+++ b/etcdserver/api/etcdhttp/metrics.go
@@ -134,7 +134,10 @@ func checkHealth(srv etcdserver.ServerV2, excludedAlarms AlarmSet) Health {
}
if h.Health == "true" {
- ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+ time_out := time.Second*5
+ plog.Debugf("/health check; QGET timeout: %v", time_out)
+
+ ctx, cancel := context.WithTimeout(context.Background(), time_out)
_, err := srv.Do(ctx, etcdserverpb.Request{Method: "QGET"})
cancel()
if err != nil {
--
2.25.1

View File

@ -1 +0,0 @@
0001-Increate-health-check-timeout.patch

View File

@ -1,13 +1,7 @@
#!/usr/bin/make -f
export DH_GOLANG_GO_GENERATE := 0
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
export DH_VERBOSE = 1
%:
dh $@ --buildsystem=golang --with=golang --builddirectory=_build
# There is a script named "build" in the upstream source.
# So let us be explicit about the .PHONY target here to avoid conflicts.
build:
dh build --buildsystem=golang --with=golang --builddirectory=_build
.PHONY: build
dh $@

View File

@ -1,11 +1,11 @@
---
debname: etcd
debver: 3.4.27
debver: 3.4.36
dl_path:
name: etcd-3.4.27.tar.gz
url: https://github.com/etcd-io/etcd/archive/refs/tags/v3.4.27.tar.gz
md5sum: 8337cfbd8c437107b0b95fef06fe1d18
sha256sum: aad42ea0635bc6481b04eb6e279c6122ccd72117018296aab32d0f9d6d606243
name: etcd-3.4.36.tar.gz
url: https://github.com/etcd-io/etcd/releases/download/v3.4.36/etcd-v3.4.36-linux-amd64.tar.gz
md5sum: a00d13822c46ca6c6224b537499f62b2
sha256sum: 077e2054cefb5015089d76b8a665827c3965ac275e23faacb34ef5878f768550
revision:
dist: $STX_DIST
GITREVCOUNT: