frobware
commented
4 months ago Patch to be applied to https://pkgs.devel.redhat.com/cgit/rpms/haproxy/log/?h=rhaos-4.17-rhel-9
From 729a34e0ba35cf05fe0ae32a082fbfe0fed7bbe1 Mon Sep 17 00:00:00 2001
From: Andrew McDermott <amcdermo@redhat.com>
Date: Tue, 25 Jun 2024 13:47:50 +0100
Subject: Bump to 2.8.10
Drop old carry patches.
---
.gitignore | 1 +
...ck-Always-clear-retry-flags-in-read-.patch | 78 -------------------
...y-only-tid-0-must-not-sleep-if-got-s.patch | 44 -----------
haproxy.spec | 13 ++--
sources | 2 +-
5 files changed, 8 insertions(+), 130 deletions(-)
delete mode 100644 0001-BUG-MAJOR-ssl_sock-Always-clear-retry-flags-in-read-.patch
delete mode 100644 0001-BUG-MINOR-haproxy-only-tid-0-must-not-sleep-if-got-s.patch
diff --git a/.gitignore b/.gitignore
index 87a9319..58118d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/haproxy-2.6.9.tar.gz
/haproxy-2.6.13.tar.gz
/haproxy-2.8.5.tar.gz
+/haproxy-2.8.10.tar.gz
diff --git a/0001-BUG-MAJOR-ssl_sock-Always-clear-retry-flags-in-read-.patch b/0001-BUG-MAJOR-ssl_sock-Always-clear-retry-flags-in-read-.patch
deleted file mode 100644
index c8b3871..0000000
--- a/0001-BUG-MAJOR-ssl_sock-Always-clear-retry-flags-in-read-.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 6402ae5c1c81efbf1679e589f94ab05d4b85ccc2 Mon Sep 17 00:00:00 2001
-From: Olivier Houchard <cognet@ci0.org>
-Date: Sat, 27 Jan 2024 22:58:29 +0100
-Subject: BUG/MAJOR: ssl_sock: Always clear retry flags in read/write functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It has been found that under some rare error circumstances,
-SSL_do_handshake() could return with SSL_ERROR_WANT_READ without
-even trying to call the read function, causing permanent wakeups
-that prevent the process from sleeping.
-
-It was established that this only happens if the retry flags are
-not systematically cleared in both directions upon any I/O attempt,
-but, given the lack of documentation on this topic, it is hard to
-say if this rather strange behavior is expected or not, otherwise
-why wouldn't the library always clear the flags by itself before
-proceeding?
-
-In addition, this only seems to affect OpenSSL 1.1.0 and above,
-and does not affect wolfSSL nor aws-lc.
-
-A bisection on haproxy showed that this issue was first triggered by
-commit a8955d57ed ("MEDIUM: ssl: provide our own BIO."), which means
-that OpenSSL's socket BIO does not have this problem. And this one
-does always clear the flags before proceeding. So let's just proceed
-the same way. It was verified that it properly fixes the problem,
-does not affect other implementations, and doesn't cause any freeze
-nor spurious wakeups either.
-
-Many thanks to Valentín Gutiérrez for providing a network capture
-showing the incident as well as a reproducer. This is GH issue #2403.
-
-This patch needs to be backported to all versions that include the
-commit above, i.e. as far as 2.0.
-
-(cherry picked from commit 1ad19917213fac57ee37e581b0ef137e36c6309d)
-Signed-off-by: Willy Tarreau <w@1wt.eu>
----
- src/ssl_sock.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/ssl_sock.c b/src/ssl_sock.c
-index 36c3490f7..d6cfb227a 100644
---- a/src/ssl_sock.c
-+++ b/src/ssl_sock.c
-@@ -224,11 +224,11 @@ static int ha_ssl_write(BIO *h, const char *buf, int num)
- tmpbuf.head = 0;
- flags = (ctx->xprt_st & SSL_SOCK_SEND_MORE) ? CO_SFL_MSG_MORE : 0;
- ret = ctx->xprt->snd_buf(ctx->conn, ctx->xprt_ctx, &tmpbuf, num, flags);
-+ BIO_clear_retry_flags(h);
- if (ret == 0 && !(ctx->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_WR_SH))) {
- BIO_set_retry_write(h);
- ret = -1;
-- } else if (ret == 0)
-- BIO_clear_retry_flags(h);
-+ }
- return ret;
- }
-
-@@ -256,11 +256,11 @@ static int ha_ssl_read(BIO *h, char *buf, int size)
- tmpbuf.data = 0;
- tmpbuf.head = 0;
- ret = ctx->xprt->rcv_buf(ctx->conn, ctx->xprt_ctx, &tmpbuf, size, 0);
-+ BIO_clear_retry_flags(h);
- if (ret == 0 && !(ctx->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH))) {
- BIO_set_retry_read(h);
- ret = -1;
-- } else if (ret == 0)
-- BIO_clear_retry_flags(h);
-+ }
-
- return ret;
- }
---
-2.43.0
-
diff --git a/0001-BUG-MINOR-haproxy-only-tid-0-must-not-sleep-if-got-s.patch b/0001-BUG-MINOR-haproxy-only-tid-0-must-not-sleep-if-got-s.patch
deleted file mode 100644
index 69be68e..0000000
--- a/0001-BUG-MINOR-haproxy-only-tid-0-must-not-sleep-if-got-s.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4d895b9e4bee9cdab6630203f935f98afd35ec06 Mon Sep 17 00:00:00 2001
-From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
-Date: Mon, 6 May 2024 14:24:41 +0200
-Subject: BUG/MINOR: haproxy: only tid 0 must not sleep if got signal
-
-This patch fixes the commit eea152ee68
-("BUG/MINOR: signals/poller: ensure wakeup from signals").
-
-There is some probability that run_poll_loop() becomes inifinite, if
-TH_FL_SLEEPING is withdrawn from all threads in the second signal_queue_len
-check, when a signal has received just after the first one.
-
-In such particular case, the 'wake' variable, which is used to terminate
-thread's poll loop is never reset to 0. So, we never enter to the "stopping"
-part of the run_poll_loop() and threads, except the one with id 0 (tid 0
-handles signals), will continue to call _do_poll() eternally and will never
-sleep, as its TH_FL_SLEEPING flag was unset.
-
-This flag needs to be removed only for the tid 0, as it was done in the first
-signal_queue_len check.
-
-This fixes an issue #2537 "infinite loop when shutting down".
-
-This fix must be backported in every stable version.
----
- src/haproxy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/haproxy.c b/src/haproxy.c
-index f7a91b9d3..4c7754939 100644
---- a/src/haproxy.c
-+++ b/src/haproxy.c
-@@ -2983,7 +2983,7 @@ void run_poll_loop()
- if (thread_has_tasks()) {
- activity[tid].wake_tasks++;
- _HA_ATOMIC_AND(&th_ctx->flags, ~TH_FL_SLEEPING);
-- } else if (signal_queue_len) {
-+ } else if (signal_queue_len && tid == 0) {
- /* this check is required after setting TH_FL_SLEEPING to avoid
- * a race with wakeup on signals using wake_threads() */
- _HA_ATOMIC_AND(&th_ctx->flags, ~TH_FL_SLEEPING);
---
-2.44.0
-
diff --git a/haproxy.spec b/haproxy.spec
index 320877f..82e17cd 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -9,8 +9,8 @@
%define real_name haproxy28
Name: haproxy
-Version: 2.8.5
-Release: 2.rhaos4.16%{?dist}
+Version: 2.8.10
+Release: 1.rhaos4.17%{?dist}
Summary: Do not ship, install or use this, use %{real_name} subpackage instead
License: GPLv2+
@@ -18,9 +18,6 @@ License: GPLv2+
URL: http://www.haproxy.org/
Source0: http://www.haproxy.org/download/2.8/src/haproxy-%{version}.tar.gz
-Patch0: 0001-BUG-MAJOR-ssl_sock-Always-clear-retry-flags-in-read-.patch
-Patch1: 0001-BUG-MINOR-haproxy-only-tid-0-must-not-sleep-if-got-s.patch
-
BuildRequires: gcc
BuildRequires: make
BuildRequires: openssl-devel
@@ -53,8 +50,6 @@ availability environments. Indeed, it can:
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
regparm_opts=
@@ -96,6 +91,10 @@ fi
%{_sbindir}/%{name}
%changelog
+* Tue Jun 25 2024 Andrew McDermott <amcdermo@redhat.com> - 2.8.10-1.rhaos4.17
+- Bump to 2.8.10
+- Drop carry patches
+
* Thu May 16 2024 Andrew McDermott <amcdermo@redhat.com> - 2.8.5-2.rhaos4.16
- Resolve https://issues.redhat.com/browse/OCPBUGS-32369 (HAProxy consuming high cpu usage)
- Carry fix for https://github.com/haproxy/haproxy/issues/2537
diff --git a/sources b/sources
index 8d0d802..501fe14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (haproxy-2.8.5.tar.gz) = 7634b9f7d85a246ea467335f71def0085ec63f96f862d2e0016b206c266e5c9cafce1431a7ebe1e8cb0e4f2a80cd5d8f9222c93630c74170bb4175000623380b
+SHA512 (haproxy-2.8.10.tar.gz) = 0a36f1e17702f4ab6eccf1c10643f4685e8c8b272cc71cbf5feb61c8c95ea52b5fc47eeefc97390bb8cb4ac1d52db0c9ad3c0510f8ca017bf10204690554c6d2
--
2.44.1From 5a45f2ffa5d3624a910f15de32eb7feee7c9a253 Mon Sep 17 00:00:00 2001
From: Andrew McDermott <amcdermo@redhat.com>
Date: Thu, 27 Jun 2024 13:22:11 +0100
Subject: haproxy.spec: Optionally enable debug builds
Add a new build type variable to switch between 'debug' and 'release'
builds. The default build type is 'release'. In 'debug' mode, adjust the
compilation flags to create a binary suitable for debugging with gdb.
This allows inspection of variables and function parameters.
Usage:
$ rpmbuild --define '_build_type debug' -ba haproxy.spec
Modify %optflags and %__global_ldflags in 'debug' mode to include
debugging information and disable optimisations.
---
haproxy.spec | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/haproxy.spec b/haproxy.spec
index 320877f..2e754f2 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -6,6 +6,18 @@
%global _hardened_build 1
+# The variable _build_type allows switching between 'debug' and
+# 'release' builds. The default is 'release'.
+#
+# In 'debug' mode, the compilation flags are adjusted to create a
+# binary suitable for debugging with gdb. 'debug' mode ensures
+# variables and function parameters can be inspected.
+#
+# Usage:
+#
+# $ rpmbuild --define '_build_type debug' -ba haproxy.spec
+%global build_type %{?_build_type}%{!?_build_type:release}
+
%define real_name haproxy28
Name: haproxy
@@ -62,6 +74,11 @@ regparm_opts=
regparm_opts="USE_REGPARM=1"
%endif
+%if "%{build_type}" == "debug"
+%define optflags -g -ggdb3 -fno-inline -fno-omit-frame-pointer -O0
+%define __global_ldflags -g -ggdb3
+%endif
+
%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_CRYPT_H=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}"
%install
--
2.45.2
openshift-ci-robot
gcs278
openshift-ci[bot]
ShudiLi
[APPROVALNOTIFIER] This PR is NOT APPROVED
This pull-request has been approved by: Once this PR has been reviewed and has the lgtm label, please ask for approval from frobware. For more information see the Kubernetes Code Review Process.
The full list of commands accepted by this bot can be found here.