Hello community,
here is the log from the commit of package haproxy for openSUSE:Factory checked
in at 2015-03-11 09:58:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haproxy (Old)
and /work/SRC/openSUSE:Factory/.haproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2015-02-18
12:08:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2015-03-11
09:58:15.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Mar 5 22:10:56 UTC 2015 - mrueck...@suse.de
+
+- added another fix from upstream:
+ 0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch
+
+-------------------------------------------------------------------
New:
----
0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haproxy.spec ++++++
--- /var/tmp/diff_new_pack.ibLkQ1/_old 2015-03-11 09:58:17.000000000 +0100
+++ /var/tmp/diff_new_pack.ibLkQ1/_new 2015-03-11 09:58:17.000000000 +0100
@@ -63,6 +63,7 @@
Patch4: haproxy-1.5.8-fix-bashisms.patch
Patch5: 0001-BUG-MINOR-pattern-error-message-missing.patch
Patch6: 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch
+Patch7: 0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch
#
Source99: haproxy-rpmlintrc
#
@@ -99,6 +100,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
%{__make} \
++++++ 0001-BUG-MINOR-pattern-error-message-missing.patch ++++++
--- /var/tmp/diff_new_pack.ibLkQ1/_old 2015-03-11 09:58:17.000000000 +0100
+++ /var/tmp/diff_new_pack.ibLkQ1/_new 2015-03-11 09:58:17.000000000 +0100
@@ -1,7 +1,7 @@
From e338a8741983acc9a4501a03ecd593d89e6fade3 Mon Sep 17 00:00:00 2001
From: Thierry FOURNIER <tfourn...@exceliance.fr>
Date: Fri, 6 Feb 2015 17:50:55 +0100
-Subject: [PATCH 1/2] BUG/MINOR: pattern: error message missing
+Subject: [PATCH 1/3] BUG/MINOR: pattern: error message missing
This patch must be backported in 1.5 version.
(cherry picked from commit 8aa8384e22dd0b66ded00c70a9c6034278b4bb69)
++++++ 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch ++++++
--- /var/tmp/diff_new_pack.ibLkQ1/_old 2015-03-11 09:58:17.000000000 +0100
+++ /var/tmp/diff_new_pack.ibLkQ1/_new 2015-03-11 09:58:17.000000000 +0100
@@ -1,7 +1,7 @@
From 623401b983185c1e0f6507e96557de3bc46fd41b Mon Sep 17 00:00:00 2001
From: Thierry FOURNIER <tfourn...@exceliance.fr>
Date: Fri, 6 Feb 2015 17:53:54 +0100
-Subject: [PATCH 2/2] BUG/MEDIUM: pattern: some entries are not deleted with
+Subject: [PATCH 2/3] BUG/MEDIUM: pattern: some entries are not deleted with
case insensitive match
ACL or map entries are not deleted with the command "del acl" or "del map"
++++++ 0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch ++++++
>From bfb8f885955efa1ef90f79595f16a01e30fd0dcf Mon Sep 17 00:00:00 2001
From: Simon Horman <ho...@verge.net.au>
Date: Thu, 26 Feb 2015 11:26:17 +0900
Subject: [PATCH] BUG/MEDIUM: Do not consider an agent check as failed on L7
error
As failure to connect to the agent check is not sufficient to mark it as
failed it stands to reason that an L7 error shouldn't either.
Without this fix if an L7 error occurs, for example of connectivity to the
agent is lost immediately after establishing a connection to it, then the
agent check will be considered to have failed and thus may end up with zero
health. Once this has occurred if the primary health check also reaches
zero health, which is likely if connectivity to the server is lost, then
the server will be marked as down and not be marked as up again until a
successful agent check occurs regardless of the success of any primary
health checks.
This behaviour is not correct as a failed agent check should never cause a
server to be marked as down or by extension continue to be marked as down.
Signed-off-by: Simon Horman <ho...@verge.net.au>
(cherry picked from commit eaabd52e29a29187f9829fe727028a6ca530cbf9)
---
src/checks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/checks.c b/src/checks.c
index b9048da..71debb6 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -246,7 +246,7 @@ static void set_server_check_status(struct check *check,
short status, const cha
* cause the server to be marked down.
*/
if ((!(check->state & CHK_ST_AGENT) ||
- (check->status >= HCHK_STATUS_L7TOUT)) &&
+ (check->status >= HCHK_STATUS_L57DATA)) &&
(check->health >= check->rise)) {
s->counters.failed_checks++;
report = 1;
--
2.3.0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
