From 55a8adac48a8eef789a19eee7d1f6a406d79b53d08d9f4fd53e18c84585b9593 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 11 Mar 2015 08:58:15 +0000 Subject: [PATCH] Accepting request 290035 from network:ha-clustering:Factory 1 OBS-URL: https://build.opensuse.org/request/show/290035 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=25 --- ...-MINOR-pattern-error-message-missing.patch | 2 +- ...rn-some-entries-are-not-deleted-with.patch | 2 +- ...t-consider-an-agent-check-as-failed-.patch | 43 +++++++++++++++++++ haproxy.changes | 6 +++ haproxy.spec | 2 + 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch diff --git a/0001-BUG-MINOR-pattern-error-message-missing.patch b/0001-BUG-MINOR-pattern-error-message-missing.patch index 105f8f6..4c3209c 100644 --- a/0001-BUG-MINOR-pattern-error-message-missing.patch +++ b/0001-BUG-MINOR-pattern-error-message-missing.patch @@ -1,7 +1,7 @@ From e338a8741983acc9a4501a03ecd593d89e6fade3 Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER 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) diff --git a/0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch b/0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch index c502d33..ab8703c 100644 --- a/0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch +++ b/0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch @@ -1,7 +1,7 @@ From 623401b983185c1e0f6507e96557de3bc46fd41b Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER 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" diff --git a/0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch b/0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch new file mode 100644 index 0000000..814196a --- /dev/null +++ b/0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch @@ -0,0 +1,43 @@ +From bfb8f885955efa1ef90f79595f16a01e30fd0dcf Mon Sep 17 00:00:00 2001 +From: Simon Horman +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 +(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 + diff --git a/haproxy.changes b/haproxy.changes index 3b32323..72a4ad5 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 5 22:10:56 UTC 2015 - mrueckert@suse.de + +- added another fix from upstream: + 0003-BUG-MEDIUM-Do-not-consider-an-agent-check-as-failed-.patch + ------------------------------------------------------------------- Wed Feb 11 12:38:06 GMT 2015 - aspiers@suse.com diff --git a/haproxy.spec b/haproxy.spec index 96b2003..d3c7cce 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -63,6 +63,7 @@ Patch3: sec-options.patch 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 @@ the most work done from every CPU cycle. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %{__make} \