Re: [PATCH] MEDIUM: Add external check

2014-06-19 Thread Simon Horman
On Fri, Jun 20, 2014 at 07:10:55AM +0200, Willy Tarreau wrote: > On Fri, Jun 20, 2014 at 12:30:16PM +0900, Simon Horman wrote: > > Add an external check which makes use of an external process to > > check the status of a server. > > > > --- > > > > v8 >

Re: [PATCH] BUG/MEDIUM: Consistently use 'check' in process_chk

2014-06-19 Thread Simon Horman
On Fri, Jun 20, 2014 at 07:07:56AM +0200, Willy Tarreau wrote: > On Fri, Jun 20, 2014 at 12:29:47PM +0900, Simon Horman wrote: > > I am not entirely sure that this is a bug, but it seems > > to me that it may cause a problem if there agent-check is > > configured and there

[PATCH] MEDIUM: Add external check

2014-06-19 Thread Simon Horman
Add an external check which makes use of an external process to check the status of a server. --- v8 * Rebase onto v1.6-dev0 v7 * Manual Rebase * Make "option external-check" configuration parameter boolean * Add "external-check command" configuration parameter * Add "external-check path" confi

[PATCH] BUG/MEDIUM: Consistently use 'check' in process_chk

2014-06-19 Thread Simon Horman
I am not entirely sure that this is a bug, but it seems to me that it may cause a problem if there agent-check is configured and there is some kind of error making a connection for it. Signed-off-by: Simon Horman --- src/checks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH v8] MEDIUM: Add port_to_str helper

2014-06-16 Thread Simon Horman
On Mon, Jun 16, 2014 at 10:11:10AM +0200, Willy Tarreau wrote: > On Mon, Jun 16, 2014 at 09:39:41AM +0900, Simon Horman wrote: > > This helper is similar to addr_to_str but > > tries to convert the port rather than the address > > of a struct sockaddr_storage. > > >

[PATCH v8] MEDIUM: Add port_to_str helper

2014-06-15 Thread Simon Horman
This helper is similar to addr_to_str but tries to convert the port rather than the address of a struct sockaddr_storage. This is in preparation for supporting an external agent check. Signed-off-by: Simon Horman -- v8 * Correct endian problem by calling ntohs(port) v7 * First post

Re: [PATCH v7 1/3] MEDIUM: Add port_to_str helper

2014-06-15 Thread Simon Horman
On Mon, Jun 16, 2014 at 08:55:52AM +0900, Simon Horman wrote: > On Fri, Jun 13, 2014 at 06:39:18PM +0200, Willy Tarreau wrote: > > On Fri, Jun 13, 2014 at 04:18:15PM +0900, Simon Horman wrote: > > > This helper is similar to addr_to_str but > > > tries to convert the p

Re: [PATCH v7 1/3] MEDIUM: Add port_to_str helper

2014-06-15 Thread Simon Horman
On Fri, Jun 13, 2014 at 06:39:18PM +0200, Willy Tarreau wrote: > On Fri, Jun 13, 2014 at 04:18:15PM +0900, Simon Horman wrote: > > This helper is similar to addr_to_str but > > tries to convert the port rather than the address > > of a struct sockaddr_storage. > > >

Re: [PATCH v7 0/3] MEDIUM: Add external check

2014-06-13 Thread Simon Horman
On Fri, Jun 13, 2014 at 10:41:54AM +0200, Willy Tarreau wrote: > Hi Simon! > > On Fri, Jun 13, 2014 at 04:18:14PM +0900, Simon Horman wrote: > > Add an external check which makes use of an external process to > > check the status of a server. > > > > v7 updates

[PATCH v7 3/3] MEDIUM: Add external check

2014-06-13 Thread Simon Horman
Add an external check which makes use of an external process to check the status of a server. --- Status: pending v7 * Manual Rebase * Make "option external-check" configuration parameter boolean * Add "external-check command" configuration parameter * Add "external-check path" configuration pa

[PATCH v7 2/3] MEDIUM: Break out check establishment into connect_chk()

2014-06-13 Thread Simon Horman
This is in preparation for adding a new type of check that uses a process rather than a socket. Signed-off-by: Simon Horman --- v7 * Use connect_chk() as the name of the new function * Manual rebase - Add SN_ERR_UP return value to connect_chk() to handle the case where the task should be

[PATCH v7 0/3] MEDIUM: Add external check

2014-06-13 Thread Simon Horman
Add an external check which makes use of an external process to check the status of a server. v7 updates this patchset as per the feedback received for v6 (a very long time ago). Simon Horman (3): MEDIUM: Add port_to_str helper MEDIUM: Break out check establishment into connect_chk

[PATCH v7 1/3] MEDIUM: Add port_to_str helper

2014-06-13 Thread Simon Horman
This helper is similar to addr_to_str but tries to convert the port rather than the address of a struct sockaddr_storage. This is in preparation for supporting an external agent check. Signed-off-by: Simon Horman -- v7 * First post --- include/common/standard.h | 8 src/standard.c

Re: can not set mss on FreeBSD 10

2014-05-13 Thread k simon
Thank you, Lukas. Maybe I can workaround it on the front router. Regards Simon 于 14-5-13 23:29, Lukas Tribus 写道: Hi Simon, Hi,Lists, I found haproxy 1.4.25 can not set mss on FreeBSD 10-stable as below: # /usr/local/sbin/haproxy -f /opt/etc/haproxy.conf [WARNING] 132/170407 (71806

Re: Socket Read Errors and Timeouts on FreeBSD

2014-05-13 Thread k simon
does not check sequence numbers. Regards Simon

can not set mss on FreeBSD 10

2014-05-13 Thread k simon
, maxpollevents = 200 Encrypted password support via crypt(3): yes Available polling systems : kqueue : pref=300, test result OK poll : pref=200, test result OK select : pref=150, test result OK Total: 3 (3 usable), will use kqueue. Regards Simon

about pcre

2014-05-07 Thread k simon
Hi,Lists, I found I can not share the same regex txt for haproxy and squid. And I noticed that haproxy use OS libc's regex by default, and can change it with compile parameters "REGEX=pcre". Should I recompile haproxy and share the same regex txt? Regards Simon

Re: 1.5 dev22 issue on freebsd10-stable

2014-04-16 Thread k simon
于 14-4-16 21:35, Willy Tarreau 写道: On Wed, Apr 16, 2014 at 02:32:03PM +0100, Simon Dick wrote: On 16 April 2014 13:41, Ghislain wrote: Le 16/04/2014 08:39, Willy Tarreau a écrit : On a personal note, I'd say that I consider the support for strace and tcpdump as absolute prerequisite

Re: 1.5 dev22 issue on freebsd10-stable

2014-04-16 Thread Simon Dick
On 16 April 2014 13:41, Ghislain wrote: > Le 16/04/2014 08:39, Willy Tarreau a écrit : > >> On a personal note, I'd say that I consider the support for strace and >> tcpdump as absolute prerequisite when it comes to any platform going into >> production, to the point of even reconsidering the plat

Re: 1.5 dev22 issue on freebsd10-stable

2014-04-15 Thread k simon
Hi,Willy, I'm sorry about strace only support i386 on FreeBSD box, but I'm working on amd64. # uname -a FreeBSD ha-l1-n2 10.0-STABLE FreeBSD 10.0-STABLE #0 r264098: Fri Apr 4 10:57:19 CST 2014 root@ha-l1-n2:/usr/obj/usr/src/sys/10-stable-r264098 amd64 Simon 于 14-4-16 13

Re: 1.5 dev22 issue on freebsd10-stable

2014-04-15 Thread k simon
ueue : pref=300, test result OK poll : pref=200, test result OK select : pref=150, test result OK Total: 3 (3 usable), will use kqueue. Simon

Re: 1.5 dev22 issue on freebsd10-stable

2014-04-15 Thread k simon
900+, is TW state really a problem ? I have set the portrange from 12000 to 6. Simon 于 14-4-15 18:15, Willy Tarreau 写道: Hi Simon, On Tue, Apr 15, 2014 at 04:22:35PM +0800, k simon wrote: Hi,List, I got a 1.5 dev22 issue on freebsd 10-stable. It reported like below, it's gene

Re: Spam

2014-04-15 Thread Simon Dick
I couldn't care less about the spam that comes through, the bit that annoys me is the mailing list emails when gmail doesn't accept spam and the software complains messages are bouncing :) On 15 April 2014 00:23, Steven Le Roux wrote: > Ok let's do the math. > > search(in:spam in:lists-haproxy be

1.5 dev22 issue on freebsd10-stable

2014-04-15 Thread k simon
t;server" section, but nothing helped. Then I stop it,compiled haproxy 1.4-25 and execute it, the error messages disappears. Is it a version 1.5 bug ? Regards Simon Apr 15 14:56:05 localhost haproxy[17725]: Connect() failed for backend squid3-bulk-keepalive: local address already in use.

haproxy 1.5-dev21 stopped forwarding traffic

2014-03-25 Thread Xu (Simon) Chen
I am using 1.5-dev21-6b07bf7. The haproxy process was running, the web gui was responding. According to the web gui, all the backends were up, and I restarted all backend services to make sure as well. When I send connections to the front-end, TCP connection was established to haproxy, and then st

recent test for dev22 on BSD

2014-03-20 Thread k simon
it's work normal. But I am not sure about it. 4.The dev22 can compiled on DragonflyBSD, but it's silent stalled. Regards Simon

Re: Does http-request worked with tunnel mode?

2014-03-14 Thread k simon
Is it possible add X-Foward-For for each request in http-tunnel mode ? Simon 于 14-3-11 11:53, k simon 写道: > Hi,List, > > I am puzzled with "set a header" for each request in "tunnel mode". > As I know, tunnel mode only analyze the first transaction

Does http-request worked with tunnel mode?

2014-03-10 Thread k simon
ttpclose". When using it with "server-close" or "http-keep-alive", it would have lost of CLOSED\LAST-ACK states etc. Regards Simon

Re: HAProxy graceful restart old process not going away

2014-01-27 Thread k simon
We got the simlar problem, then capture the traffic and found it's result in websocket. So we had to kill the old process manually when finished graceful restart. 于 28/1/14 下午2:37, Willy Tarreau 写道: On Mon, Jan 27, 2014 at 11:24:46PM +, Wei Kong wrote: We use /usr/sbin/haproxy -f /e

Re: timeout timer

2014-01-21 Thread Xu (Simon) Chen
, lasted 300 192.168.78.155:43902 disappeared at 1390318815, lasted 300 Looks like the tunnel timeout is definitely making a difference.. -Simon On Mon, Jan 20, 2014 at 1:08 AM, Baptiste wrote: > Hi Xu, > > Which version of HAProxy? > Can you test with a timeout tunnel set to

timeout timer

2014-01-19 Thread Xu (Simon) Chen
ine be extended if there is traffic? Or maybe I set something wrong? Thanks. -Simon

Re: Feature request: TOS based ACL.

2014-01-02 Thread k simon
f you want split some tcp request traffic for special purpose, may be you can set ttl or tos on the front router/firewall ,then capture it with "ipfw" tool and redirect it to the customed "frontend". But that leads complex configurations. Simon 于 2/1/14 下午11:56, Lukas Tribu

example of agent-check ?

2013-12-27 Thread Simon Drake
s for your help and a great haproxy.* *Simon *

Re: HAProxy Next?

2013-12-17 Thread k simon
-haproxy is a good tcp proxy ,now it can classify http traffic, and it's cool to classify other type traffic such as telnet\ssh\ftp etc. ? 17/12/13 ??4:14, Annika Wickert ??: Hi all, we did some thinking about how to improve haproxy and which features we’d like to see in next versions.

Re: Health check hell

2013-12-02 Thread Simon Horman
On Thu, Nov 28, 2013 at 03:41:15PM +0100, Willy Tarreau wrote: > Hi guys, > > I'm CCing the persons who've been most involved in the evolutions of the > health check system and who might have strong opinions about what to take > care of. > > The recent inclusion of the agent-check has unveiled ho

Re: set weight bug?

2013-11-27 Thread Simon Horman
ecent changes. It caused an > (almost) infinite recursion. It was easier to see here because I have > no server responding to your addresses, so the process crashes as soon > as the first server fails the first check. > > I'm attaching the fix to apply on top of your snapshot,

Re: [PATCH v7 0/9] Auxiliary Agent Check

2013-11-26 Thread Simon Horman
On Mon, Nov 25, 2013 at 12:43:59PM +0100, Willy Tarreau wrote: > On Mon, Nov 25, 2013 at 10:06:16AM +, Malcolm Turnbull wrote: > > Willy, > > > > Our agent currently replies with: > > > > drain\n > > stop\n > > 50%\n > > etc. > > > > and its not in production yet (looking forward to it being

[PATCH v7 7/9] MEDIUM: Set rise and fall of agent checks to 1

2013-11-24 Thread Simon Horman
f the agent check to be configurable, however this has not been implemented at this stage. Signed-off-by: Simon Horman --- v7 * Manual Rebase * Remove residual instance of 'server->' in comment in struct check hunk Notes by Willy on v6: One remaining "server" below :

[PATCH v7 9/9] MEDIUM: Add DRAIN state and report it on the stats page

2013-11-24 Thread Simon Horman
Add a DRAIN sub-state for a server which will be shown on the stats page instead of UP if its effective weight is zero. Also, log if a server enters or leaves the DRAIN state as the result of an agent check. Signed-off-by: Simon Horman --- Status: pending v7 * Update comment above

[PATCH v7 5/9] MEDIUM: checks: Add supplementary agent checks

2013-11-24 Thread Simon Horman
a description string. This currently has the same behaviour as "down". Signed-off-by: Simon Horman --- v7 * Manual Rebase * Add "agent-check" keyword which is used to enable agent checks explicitly. This allows the "agent-port" setting to be used in th

[PATCH v7 8/9] MEDIUM: Add enable and disable agent unix socket commands

2013-11-24 Thread Simon Horman
den by the agent. Signed-off-by: Simon Horman --- v7 * Manual rebase * Use enable|disable agent / instead of set agent / pause|unpause. - This is a reasonably trivial re-write of most of the patch * Rename patch from "MEDIUM: Add set agent pause|unpause unix socket command" to &qu

[PATCH v7 6/9] MEDIUM: Do not mark a server as down if the agent is unavailable

2013-11-24 Thread Simon Horman
In the case where agent-port is used and the agent check is a secondary check to not mark a server as down if the agent becomes unavailable. In this configuration the agent should only cause a server to be marked as down if the agent returns "fail", "stopped" or "dow

[PATCH v7 3/9] MEDIUM: Log agent fail, stopped or down as info

2013-11-24 Thread Simon Horman
-by: Simon Horman --- v7 * Manual Rebase Notes by Willy on v6: OK --- src/checks.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/checks.c b/src/checks.c index 6b7c382..d865c0b 100644 --- a/src/checks.c +++ b/src/checks.c @@ -1010,10 +1010,7 @@ static void

[PATCH v7 4/9] MEDIUM: Remove option lb-agent-chk

2013-11-24 Thread Simon Horman
-used by the planned features that are mentioned above. Signed-off-by: Simon Horman --- v7 * First post --- doc/configuration.txt | 53 ++- src/cfgparse.c| 7 --- 2 files changed, 6 insertions(+), 54 deletions(-) diff --git a/doc/con

[PATCH v7 1/9] MEDIUM: Add helper for task creation for checks

2013-11-24 Thread Simon Horman
This helper is in preparation for adding a second struct check element to struct server. Signed-off-by: Simon Horman --- v7 * Moved cfgparse change to previous patch * Reversed polarity of start_check_task() and updated caller accordingly * Move increment of servpos to outside of if condition

[PATCH v7 0/9] Auxiliary Agent Check

2013-11-24 Thread Simon Horman
d-external-check-v7.snapshot.20141125 Simon Horman (9): MEDIUM: Add helper for task creation for checks MEDIUM: Add helper function for failed checks MEDIUM: Log agent fail, stopped or down as info MEDIUM: Remove option lb-agent-chk MEDIUM: checks: Add supplementary agent checks MEDIUM: D

[PATCH v7 2/9] MEDIUM: Add helper function for failed checks

2013-11-24 Thread Simon Horman
This consolidates some logic in preparation for enhancing it. Signed-off-by: Simon Horman --- Status: pending v7 * First post in this form. Previously part of "MEDIUM: Do not mark a server as down if the agent is unavailable" --- src/checks.c | 37 --

Re: [PATCH v7 0/5] Auxiliary Agent Check Preparation

2013-11-19 Thread Simon Horman
On Tue, Nov 19, 2013 at 09:39:02AM +0100, Willy Tarreau wrote: > On Tue, Nov 19, 2013 at 04:56:42PM +0900, Simon Horman wrote: > > > So please just tell me if you want me to simply pick all these > > > patches from your tree, in which case I will simply do that (I'm >

Re: [PATCH v7 0/5] Auxiliary Agent Check Preparation

2013-11-18 Thread Simon Horman
On Tue, Nov 19, 2013 at 08:08:26AM +0100, Willy Tarreau wrote: > Hi Simon, > > On Tue, Nov 19, 2013 at 12:45:50PM +0900, Simon Horman wrote: > > On Mon, Nov 18, 2013 at 07:36:58AM +0100, Willy Tarreau wrote: > > > On Mon, Nov 18, 2013 at 03:22:33PM +0900, Simon Horman wr

Re: [PATCH v7 0/5] Auxiliary Agent Check Preparation

2013-11-18 Thread Simon Horman
On Mon, Nov 18, 2013 at 07:36:58AM +0100, Willy Tarreau wrote: > On Mon, Nov 18, 2013 at 03:22:33PM +0900, Simon Horman wrote: > > On Mon, Nov 18, 2013 at 06:45:41AM +0100, Willy Tarreau wrote: > > > Hi Simon, > > > > > > On Tue, Nov 05, 2013 at 06:04:31PM +

Re: [PATCH v7 0/5] Auxiliary Agent Check Preparation

2013-11-17 Thread Simon Horman
On Mon, Nov 18, 2013 at 06:45:41AM +0100, Willy Tarreau wrote: > Hi Simon, > > On Tue, Nov 05, 2013 at 06:04:31PM +0900, Simon Horman wrote: > > Hi, > > > > This series is a revised subset of > > "[PATCH v6 00/22] Agent Check Enhancements and External

Re: RES: RES: RES: RES: RES: RES: RES: RES: High CPU Usage (HaProxy)

2013-11-07 Thread k simon
I ran a haproxy(nbproc=6) on freebsd 10-beta2, each frontend bind to a socket and share the same backend. Context switch normally 60k+. But the load and throughput is confused me, in the past days I ran a haproxy instance (nbproc=1), it can handle up to 500Mbps traffic . The info below

Does haproxy in transparent mode support FreeBSD's divert mechanism ?

2013-11-06 Thread k simon
Simon

Does haproxy in transparent mode support FreeBSD's divert mechanism ?

2013-11-06 Thread k simon
Simon

Re: [PATCH v7 4/5] MEDIUM: Add state to struct check

2013-11-05 Thread Simon Horman
On Tue, Nov 05, 2013 at 06:04:35PM +0900, Simon Horman wrote: > Add state to struct check. This is currently used to store one bit, > CHK_RUNNING, which is set if a check is running and clear otherwise. > This bit was previously SRV_CHK_RUNNING of the state element of struct > server.

[PATCH v7 5/5] MEDIUM: Move health element to struct check

2013-11-05 Thread Simon Horman
This is in preparation for associating a agent check with a server which runs as well as the server's existing check. Signed-off-by: Simon Horman --- v7 * Merge line-reordering update from a subsequent patch * Rebase as name field is no longer added to struct check by a previous patch

[PATCH v7 3/5] MEDIUM: cfgparse: Factor out check initialisation

2013-11-05 Thread Simon Horman
This is in preparation for struct server having two elements of type struct check. Signed-off-by: Simon Horman --- v7 * No change Notes by Willy on v6: OK v5 * Remove server argument from init_check. It is not used. * Set type in init_check This allows a zero type to be used to indicate

[PATCH v7 2/5] MEDIUM: Paramatise functions over the check of a server

2013-11-05 Thread Simon Horman
ing NULL. If NULL is used for case 2) then SSP_O_HCHK becomes supurfulous and as NULL is used for case 2) SSP_O_HCHK has been removed. Signed-off-by: Simon Horman --- This is a rather large patch and I would be happy to split it up on request. --- v7 * Paramatise set_server_enabled() over t

[PATCH v7 4/5] MEDIUM: Add state to struct check

2013-11-05 Thread Simon Horman
well as the server's existing check. Signed-off-by: Simon Horman --- v8 * Use CHK_STATE_RUNNING instead of CHK_RUNNING Notes by Willy on v6: Please use CHK_STATE_RUNNING instead of CHK_RUNNING so that it's easier to know it is related to the state attribute of the check.

[PATCH v7 1/5] MEDIUM: Move result element to struct check

2013-11-05 Thread Simon Horman
Move result element from struct server to struct check This allows check results to be independent of the check's server. This is in preparation for associating a agent check with a server which runs as well as the server's existing check. Signed-off-by: Simon Horman --- v7 * No cha

[PATCH v7 0/5] Auxiliary Agent Check Preparation

2013-11-05 Thread Simon Horman
at https://github.com/horms/haproxy.git/agent-check-v7.snapshot.20131105 Simon Horman (5): MEDIUM: Move result element to struct check MEDIUM: Paramatise functions over the check of a server MEDIUM: cfgparse: Factor out check initialisation MEDIUM: Add state to struct check MEDIUM: Move

[PATCH v2] CLEANUP: Remove unused 'last_slowstart_change' field from struct peer

2013-11-01 Thread Simon Horman
This was inadvertently added by "MEDIUM: checks: Add agent health check". It appears to have never been used. Signed-off-by: Simon Horman --- v2 * Use CLEANUP in subject --- include/types/peers.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/types/peers.h b/include/typ

Re: [PATCH] LOW: Remove unused 'last_slowstart_change' field from struct peer

2013-11-01 Thread Simon Horman
On Fri, Nov 01, 2013 at 04:43:18PM +0900, Simon Horman wrote: > This was inadvertently added by "MEDIUM: checks: Add agent health check". > It appears to have never been used. The prefix in the subject should be CLEANUP rather than LOW. I will repost. > > Signe

[PATCH v7] CLEANUP: Make parameters of srv_downtime and srv_getinter const

2013-11-01 Thread Simon Horman
The parameters of srv_downtime and srv_getinter are not modified and thus may be const. Signed-off-by: Simon Horman --- v7 * No change Notes by Willy on v6: OK --- include/proto/server.h | 4 ++-- src/server.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a

[PATCH] LOW: Remove unused 'last_slowstart_change' field from struct peer

2013-11-01 Thread Simon Horman
This was inadvertently added by "MEDIUM: checks: Add agent health check". It appears to have never been used. Signed-off-by: Simon Horman --- include/types/peers.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/types/peers.h b/include/types/peers.h index 41a1cce..d52d

Re: [PATCH v6 00/22] Agent Check Enhancements and External Check

2013-10-31 Thread Simon Horman
On Thu, Oct 31, 2013 at 10:26:06AM +0100, Willy Tarreau wrote: > Hi Malcolm, > > On Thu, Oct 31, 2013 at 09:02:04AM +, Malcolm Turnbull wrote: > > Willy / Simon, > > > > We haven't implemented it in the Loadbalancer.org appliance yet so we > > are

Re: [PATCH v6 00/22] Agent Check Enhancements and External Check

2013-10-31 Thread Simon Horman
the future. On Fri, Sep 06, 2013 at 03:05:35PM +0200, Willy Tarreau wrote: > Hi Simon, > > I'm finally done with the review. That was quite long (spread over two > weeks), and obviously less than what it might have taken you to do this > work. Next time if you can send sma

Re: HAProxy v1.5-dev19 OpenSSL Support Issue

2013-08-22 Thread Simon Horman
On Thu, Aug 22, 2013 at 09:36:34AM +0100, Scott McKeown wrote: > Sorry I must have forgot/overlooked replying to this. > > However, I did manage to get the OpenSSL Support working with the current > v1.5-dev19 downloaded directly from the the HAProxy website using the tar > image. > Saying that th

Re: If anyone is interested in testing Simon Hormans patches for the server feedback agent

2013-08-22 Thread Simon Horman
On Thu, Aug 22, 2013 at 10:11:27AM +0200, Baptiste wrote: > Let us know there, so I can test it as soon as released :) I have just released v6 to the mailing list as "[PATCH v6 00/22] Agent Check Enhancements and External Check". It can be found in git at https://github.com/horms/haproxy.git age

[PATCH v6 15/22] MEDIUM: Add http-check agent-hdr option

2013-08-22 Thread Simon Horman
Allow agent checks to obtain information in an HTTP header of the response to an http check. Signed-off-by: Simon Horman --- v4 * Do not duplicate code that is in process_result() v2 - v3 * No change --- doc/configuration.txt | 24 +-- include/types/proxy.h | 2 ++ src

[PATCH v6 19/22] MEDIUM: Set rise and fall of agent checks to 1

2013-08-22 Thread Simon Horman
f the agent check to be configurable, however this has not been implemented at this stage. Signed-off-by: Simon Horman --- v7 When checking health against rise in set_server_up the health of a check should be checked against the rise of the same check. Otherwise the condition for the s->agent

[PATCH v6 20/22] MEDIUM: Add set agent pause|unpause unix socket command

2013-08-22 Thread Simon Horman
motivation for this option is to allow weight setting is to allow the weight changing effects of the agent checks to be paused to allow the weight of a server to be configured using set weight without being overridden by the agent. The default state is unpaused. Signed-off-by: Simon Horman

[PATCH v6 21/22] MEDIUM: Break out check establishment into establish_chk()

2013-08-22 Thread Simon Horman
This is in preparation for adding a new type of check that uses a process rather than a socket. Signed-off-by: Simon Horman --- v4 * Use check->type in establish_conn_chk() Use check->type instead of s->proxy->options2 & PR_O2_CHK_ANY as the former is specific to the check

[PATCH v6 16/22] MEDIUM: Add DRAIN state and report it on the stats page

2013-08-22 Thread Simon Horman
Add a DRAIN sub-state for a server which will be shown on the stats page instead of UP if an agent check is in use and the agent has most recently returned "drain". Signed-off-by: Simon Horman --- include/types/server.h | 3 ++- src/checks.c | 7 +++ src/dumpstats.c

[PATCH v6 10/22] MEDIUM: Move health element to struct check

2013-08-22 Thread Simon Horman
This is in preparation for associating a agent check with a server which runs as well as the server's existing check. Signed-off-by: Simon Horman --- include/types/server.h | 3 ++- src/cfgparse.c | 10 +- src/checks.c

[PATCH v6 18/22] MEDIUM: Do not mark a server as down if the agent is unavailable

2013-08-22 Thread Simon Horman
In the case where agent-port is used and the agent check is a secondary check to not mark a server as down if the agent becomes unavailable. In this configuration the agent should only cause a server to be marked as down if the agent returns "fail", "stopped" or "dow

[PATCH v6 03/22] MEDIUM: Split up struct server's check element

2013-08-22 Thread Simon Horman
his will not be so easy once a second struct check element is added to struct server to accommodate an agent health check. Signed-off-by: Simon Horman --- v6 * Correct use of srv->check_common.xprt ssl_sock_prepare_srv_ctx(). Previously srv->check.xprt was used which causes a

[PATCH v6 01/22] DOC: Clarify documentation of option lb-agent-chk

2013-08-22 Thread Simon Horman
Avoid referring to check-port as this is not a configuration parameter. Signed-off-by: Simon Horman --- doc/configuration.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index 87de595..796537e 100644 --- a/doc

[PATCH v6 12/22] MEDIUM: checks: Add supplementary agent checks

2013-08-22 Thread Simon Horman
127.0.0.1:80 check agent-port 1 The agent-inter parameter may also be used to specify the interval and timeout for agent checks. If either the health or agent check determines that a server is down then it is marked as being down, otherwise it is marked as being up. Signed-off-by: Simon Horman

[PATCH v6 13/22] MEDIUM: Add helper for agent check events.

2013-08-22 Thread Simon Horman
Break agent check handling out of event_srv_chk_r(). This is in preparation for supporting agent check results returned in an HTTP header. Signed-off-by: Simon Horman --- src/checks.c | 97 1 file changed, 52 insertions(+), 45

[PATCH v6 11/22] MEDIUM: Add helper for task creation for checks

2013-08-22 Thread Simon Horman
This helper is in preparation for adding a second struct check element to struct server. Signed-off-by: Simon Horman --- v5 * Rebase --- src/cfgparse.c | 3 +-- src/checks.c | 45 +++-- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a

[PATCH v6 06/22] MEDIUM: Paramatise functions over the check of a server

2013-08-22 Thread Simon Horman
check->server. This is in preparation for associating a agent check with a server which runs as well as the server's existing check. By paramatising these functions they may act on each of the checks without further significant modification. Signed-off-by: Simon Horman --- This is

[PATCH v6 07/22] MEDIUM: cfgparse: Factor out check initialisation

2013-08-22 Thread Simon Horman
This is in preparation for struct server having two elements of type struct check. Signed-off-by: Simon Horman --- v5 * Remove server argument from init_check. It is not used. * Set type in init_check This allows a zero type to be used to indicate that a task for a secondary agent check

[PATCH v6 08/22] MEDIUM: Add state to struct check

2013-08-22 Thread Simon Horman
well as the server's existing check. Signed-off-by: Simon Horman --- include/types/server.h | 5 - src/checks.c | 8 src/dumpstats.c| 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/types/server.h b/include/types/server.h index 57

[PATCH v6 00/22] Agent Check Enhancements and External Check

2013-08-22 Thread Simon Horman
Hi, this series comprises of several components I have combined them because they depend on each other. It should be possible to review the components in order without particular regard for subsequent components. That is, it should be possible to review small subsets of this series. A. Patches

[PATCH v6 22/22] MEDIUM: Add external check

2013-08-22 Thread Simon Horman
Add an external check which makes use of an external process to check the status of a server. --- v6 * Correct implementation and documentation of arguments to external-check command so that they are consistent with both each other and ldirectord's external check. The motivation being to allo

[PATCH v6 04/22] MEDIUM: Move {,fast,down}inter to struct check

2013-08-22 Thread Simon Horman
Move {,fast,down}inter elements from struct server to struct check. This allows those elements of a check to be independent of the check's server. This is in preparation for associating a agent check with a server which runs as well as the server's existing check. Signed-off-by: Si

[PATCH v6 14/22] MEDIUM: Parser to allow matching of HTTP header

2013-08-22 Thread Simon Horman
Replace the current header parser, which simply skips the headers, with a version that allows matching of a key in a header. This is in preparation for supporting agent check results returned in an HTTP header. Signed-off-by: Simon Horman --- src/checks.c | 94

[PATCH v6 05/22] MEDIUM: Move result element to struct check

2013-08-22 Thread Simon Horman
Move result element from struct server to struct check This allows check results to be independent of the check's server. This is in preparation for associating a agent check with a server which runs as well as the server's existing check. Signed-off-by: Simon Horman --- include/type

[PATCH v6 02/22] CLEANUP: Make parameters of srv_downtime and srv_getinter const

2013-08-22 Thread Simon Horman
The parameters of srv_downtime and srv_getinter are not modified and thus may be const. Signed-off-by: Simon Horman --- include/proto/server.h | 4 ++-- src/server.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/proto/server.h b/include/proto

[PATCH v6 09/22] MEDIUM: Add name element to struct check

2013-08-22 Thread Simon Horman
This is in preparation for associating a agent check with a server which runs as well as the server's existing check. Signed-off-by: Simon Horman --- v5 * Rebase --- include/types/server.h | 1 + src/cfgparse.c | 1 + src/checks.c | 2 +- 3 files changed, 3 insertions(

[PATCH v6 17/22] MEDIUM: Log agent fail, stopped or down as info

2013-08-22 Thread Simon Horman
-by: Simon Horman --- src/checks.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/checks.c b/src/checks.c index a9a93ae..706ed31 100644 --- a/src/checks.c +++ b/src/checks.c @@ -867,10 +867,7 @@ static void agent_expect(struct check *check, char *data

Re: HAProxy v1.5-dev19 OpenSSL Support Issue

2013-08-22 Thread Simon Horman
On Tue, Aug 13, 2013 at 04:56:57PM +0200, Willy Tarreau wrote: > On Tue, Aug 13, 2013 at 03:36:09PM +0100, Scott McKeown wrote: > > Hi Guys, > > > > I've not applied any patches to the download as this was a direct 'wget' > > from the Git repository. > > As follows is the OpenSSL v1.0.0 Centos 6.4

Re: If anyone is interested in testing Simon Hormans patches for the server feedback agent

2013-08-21 Thread Simon Horman
On Wed, Aug 21, 2013 at 10:25:58AM +0200, Willy Tarreau wrote: > Hi Malcolm, > > On Thu, Aug 15, 2013 at 06:34:16PM +0100, Malcolm Turnbull wrote: > > I've put up a quick blog entry here: > > http://blog.loadbalancer.org/open-source-windows-service-for-reporting-server-load-back-to-haproxy-load-ba

[PATCH v5 06/22] MEDIUM: Paramatise functions over the check of a server

2013-07-31 Thread Simon Horman
check->server. This is in preparation for associating a agent check with a server which runs as well as the server's existing check. By paramatising these functions they may act on each of the checks without further significant modification. Signed-off-by: Simon Horman --- This is

[PATCH v5 21/22] MEDIUM: Break out check establishment into establish_chk()

2013-07-31 Thread Simon Horman
This is in preparation for adding a new type of check that uses a process rather than a socket. Signed-off-by: Simon Horman --- v4 * Use check->type in establish_conn_chk() Use check->type instead of s->proxy->options2 & PR_O2_CHK_ANY as the former is specific to the check

[PATCH v5 19/22] MEDIUM: Set rise and fall of agent checks to 1

2013-07-31 Thread Simon Horman
f the agent check to be configurable, however this has not been implemented at this stage. Signed-off-by: Simon Horman --- v5 * Rebase --- include/common/defaults.h | 2 ++ include/types/server.h| 6 +++--- src/cfgparse.c| 28 +++-

[PATCH v5 09/22] MEDIUM: Add name element to struct check

2013-07-31 Thread Simon Horman
This is in preparation for associating a agent check with a server which runs as well as the server's existing check. Signed-off-by: Simon Horman --- v5 * Rebase --- include/types/server.h | 1 + src/cfgparse.c | 1 + src/checks.c | 2 +- 3 files changed, 3 insertions(

[PATCH v5 07/22] MEDIUM: cfgparse: Factor out check initialisation

2013-07-31 Thread Simon Horman
This is in preparation for struct server having two elements of type struct check. Signed-off-by: Simon Horman --- v5 * Remove server argument from init_check. It is not used. * Set type in init_check This allows a zero type to be used to indicate that a task for a secondary agent check

[PATCH v5 15/22] MEDIUM: Add http-check agent-hdr option

2013-07-31 Thread Simon Horman
Allow agent checks to obtain information in an HTTP header of the response to an http check. Signed-off-by: Simon Horman --- v4 * Do not duplicate code that is in process_result() v2 - v3 * No change --- doc/configuration.txt | 24 +-- include/types/proxy.h | 2 ++ src

<    1   2   3   4   5   >