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

2013-07-19 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 01/22] DOC: Clarify documentation of option lb-agent-chk

2013-07-19 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 5140ff1..5297cfd 100644 --- a/doc/confi

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

2013-07-19 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: Simon Horman ---

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

2013-07-19 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/types/server.h

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

2013-07-19 Thread Simon Horman
The syntax of this new command is: set agent / pause|unpause This command changes the behaviour of agent checks as follows: In the case where an agent check is being run as a secondary check, due to the agent-port parameter of a server directive, new checks are only initialised when the agent is

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

2013-07-19 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 03/22] MEDIUM: Split up struct server's check element

2013-07-19 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. The split has been made by: * Moving elements of struct server's check element that will be shared by both checks into a new check_common element of struct server. * Moving the

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

2013-07-19 Thread Simon Horman
Hi, this series comprises of several components A. Patches 0-1 are cleanup patches DOC: Clarify documentation of option lb-agent-chk CLEANUP: Make parameters of srv_downtime and srv_getinter const B. Patches 2 - 12 add support for a secondary agent health check In this mode, a non-agent

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

2013-07-19 Thread Simon Horman
Paramatise the following functions over the check of a server * set_server_down * set_server_up * srv_getinter * server_status_printf * set_server_check_status * set_server_disabled Generally the server parameter of these functions has been removed. Where it is still needed it is obtained using c

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

2013-07-19 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/se

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

2013-07-19 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 deletio

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

2013-07-19 Thread Simon Horman
This is in preparation for struct server having two elements of type struct check. Signed-off-by: Simon Horman --- src/cfgparse.c | 59 +--- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/src/cfgparse.c b/src/cfgparse.c index

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

2013-07-19 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 | 50 ---

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

2013-07-19 Thread Simon Horman
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. This is in preparation for associating a agent check with a server which runs as w

Re: FIXED: Re: 100% cpu load....

2013-07-19 Thread Willy Tarreau
On Fri, Jul 19, 2013 at 09:58:19PM +0200, Mark Janssen wrote: > I've applied the patches and am running with the new version now. I'll let > it run overnight (with nbproc back at 1...). > I'll probably switch back to nbproc >1 in the morning, as traffic starts > ramping up. Thank you Mark, then I'

Re: FIXED: Re: 100% cpu load....

2013-07-19 Thread Mark Janssen
I've applied the patches and am running with the new version now. I'll let it run overnight (with nbproc back at 1...). I'll probably switch back to nbproc >1 in the morning, as traffic starts ramping up. Mark On Thu, Jul 18, 2013 at 10:42 PM, Willy Tarreau wrote: > Hi Mark, > > OK I could rep

[feature request] stats auth based on userlist

2013-07-19 Thread Christian Becker
Hello, we´ve just updated the statistics settings for our haproxy environment, when i noticed that haproxy has support for userlists. In the past, we´ve used the "stats" configuration in every backend and "stats auth" with plain text passwords. Now the whole "stats" related config is in the defa

RE: ECC handhake failure

2013-07-19 Thread Julien Vehent
On 2013-07-19 04:01, Lukas Tribus wrote: I suspect the issue lies somewhere in the static build of openssl, but since I followed the doc and didn't add anything funky, I'm not sure what to look at next... First thing I would do is to try OpenSSL stable, really. Even if the client correctly wor

Re: Confused by the behaviour of calloc during init() in haproxy.c

2013-07-19 Thread Godbach
On 2013/7/19 14:34, Willy Tarreau wrote: On Fri, Jul 19, 2013 at 01:55:43PM +0800, Godbach wrote: Hi Willy, Here is part information about strace during haproxy startup: open("h.cfg", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=1985, ...}) = 0 mmap(NULL, 4096, PROT_RE

RE: ECC handhake failure

2013-07-19 Thread Lukas Tribus
Hi Julien, > SSLdump taken from the server: Mmh, there is not much to read from this. Could the tcpdump the failed handshake (remember to use -s 0 to avoid truncating the packets) and provide the pcap file? > Is anybody using ECDHE with haproxy from git at > 506d050600ffa767345766bdc19752284c9