RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-04 02:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: server: change server ip address from stats socket

Browse Source 
New command available on the stats socket to change a server addr using
the command "set server <backend>/<server> addr <ip4|ip6>"
This commit is contained in:
Baptiste Assmann 2015-04-13 22:54:33 +02:00 committed by Willy Tarreau
parent 14e4014a48
commit 3d8f831f13
4 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/configuration.txt
View File

@ -14930,6 +14930,9 @@ set rate-limit ssl-sessions global <value>
is passed in number of sessions per second sent to the SSL stack. It applies
before the handshake in order to protect the stack against handshake abuses.
set server <backend>/<server> addr <ip4 or ip6 address>
Replace the current IP address of a server by the one provided.
set server <backend>/<server> agent [ up | down ]
Force a server's agent to a new state. This can be useful to immediately
switch a server's state regardless of some slow agent checks for example.

7
include/proto/server.h
View File

@ -94,6 +94,13 @@ static inline unsigned int server_throttle_rate(struct server *sv)
const char *server_parse_weight_change_request(struct server *sv,
const char *weight_str);
/*
* Parses addr_str and configures sv accordingly.
* Returns NULL on success, error message string otherwise.
*/
const char *server_parse_addr_change_request(struct server *sv,
const char *addr_str);
/*
* Return true if the server has a zero user-weight, meaning it's in draining
* mode (ie: not taking new non-persistent connections).

11
src/dumpstats.c
View File

@ -186,7 +186,7 @@ static const char stats_sock_usage_msg[] =
" show table [id]: report table usage stats or dump this table's contents\n"
" get weight : report a server's current weight\n"
" set weight : change a server's weight\n"
" set server : change a server's state or weight\n"
" set server : change a server's state, weight or address\n"
" set table [id] : update or create a table entry's data\n"
" set timeout : change a timeout setting\n"
" set maxconn : change a maxconn setting\n"
@ -1510,8 +1510,15 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
appctx->st0 = STAT_CLI_PRINT;
}
}
else if (strcmp(args[3], "addr") == 0) {
warning = server_parse_addr_change_request(sv, args[4]);
if (warning) {
appctx->ctx.cli.msg = warning;
appctx->st0 = STAT_CLI_PRINT;
}
}
else {
appctx->ctx.cli.msg = "'set server <srv>' only supports 'agent', 'health', 'state' and 'weight'.\n";
appctx->ctx.cli.msg = "'set server <srv>' only supports 'agent', 'health', 'state', 'weight' and 'addr'.\n";
appctx->st0 = STAT_CLI_PRINT;
}
return 1;

23
src/server.c
View File

@ -802,6 +802,29 @@ const char *server_parse_weight_change_request(struct server *sv,
return NULL;
}
/*
* Parses <addr_str> and configures <sv> accordingly.
* Returns:
* - error string on error
* - NULL on success
*/
const char *server_parse_addr_change_request(struct server *sv,
const char *addr_str)
{
unsigned char ip[INET6_ADDRSTRLEN];
if (inet_pton(AF_INET6, addr_str, ip)) {
update_server_addr(sv, ip, AF_INET6, "stats command\n");
return NULL;
}
if (inet_pton(AF_INET, addr_str, ip)) {
update_server_addr(sv, ip, AF_INET, "stats command\n");
return NULL;
}
return "Could not understand IP address format.\n";
}
int parse_server(const char *file, int linenum, char **args, struct proxy *curproxy, struct proxy *defproxy)
{
struct server *newsrv = NULL;