mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-24 07:11:20 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] proxy: add PR_O2_DISPATCH to detect dispatch mode

Browse Source 
Till now we used the fact that the dispatch address was not null to use
the dispatch mode. This is very unconvenient, so let's have a dedicated
option.
This commit is contained in:
Willy Tarreau 2011-03-04 22:44:16 +01:00
parent 295a837726
commit f5ab69aad9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/proxy.h
View File

@ -151,6 +151,7 @@
#define PR_O2_COOK_PSV 0x08000000 /* cookie ... preserve */
#define PR_O2_PGSQL_CHK 0x10000000 /* use PGSQL check for server health */
#define PR_O2_DISPATCH 0x20000000 /* use dispatch mode */
/* end of proxy->options2 */
/* bits for sticking rules */

5
src/backend.c
View File

@ -619,8 +619,7 @@ int assign_server(struct session *s)
goto out;
}
}
else if (!*(int *)&s->be->dispatch_addr.sin_addr &&
!(s->be->options & PR_O_TRANSP)) {
else if (!(s->be->options2 & PR_O2_DISPATCH) && !(s->be->options & PR_O_TRANSP)) {
err = SRV_STATUS_NOSRV;
goto out;
}
@ -700,7 +699,7 @@ int assign_server_address(struct session *s)
}
}
}
else if (*(int *)&s->be->dispatch_addr.sin_addr) {
else if (s->be->options2 & PR_O2_DISPATCH) {
/* connect to the defined dispatch addr */
s->req->cons->addr.s.to = s->be->dispatch_addr;
}

5
src/cfgparse.c
View File

@ -3864,6 +3864,7 @@ stats_error_parsing:
goto out;
}
curproxy->dispatch_addr = *sk;
curproxy->options2 |= PR_O2_DISPATCH;
}
else if (!strcmp(args[0], "balance")) { /* set balancing with optional algorithm */
if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL))
@ -5618,14 +5619,14 @@ int check_config_validity()
cfgerr++;
}
#endif
else if (*(int *)&curproxy->dispatch_addr.sin_addr != 0) {
else if (curproxy->options2 & PR_O2_DISPATCH) {
Warning("config : dispatch address of %s '%s' will be ignored in balance mode.\n",
proxy_type_str(curproxy), curproxy->id);
err_code |= ERR_WARN;
}
}
else if (!(curproxy->options & (PR_O_TRANSP | PR_O_HTTP_PROXY)) &&
(*(int *)&curproxy->dispatch_addr.sin_addr == 0)) {
!(curproxy->options2 & PR_O2_DISPATCH)) {
/* If no LB algo is set in a backend, and we're not in
* transparent mode, dispatch mode nor proxy mode, we
* want to use balance roundrobin by default.