RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-26 21:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: server: add new SRV_ADMF_CMAINT flag

Browse Source 
The purpose of SRV_ADMF_CMAINT flag is to keep in mind the server was
forced to maintenance status because of the configuration file.
This commit is contained in:
Baptiste Assmann 2015-08-08 15:49:13 +02:00 committed by Willy Tarreau
parent 2359ff1de2
commit 9f5ada32e4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/types/server.h
View File

@ -73,12 +73,13 @@ enum srv_state {
* state_str = (state & MAINT) ? "MAINT" : (state & DRAIN) : "DRAIN" : "READY"
*/
enum srv_admin {
SRV_ADMF_FMAINT = 0x1, /* the server was explicitly forced into maintenance */
SRV_ADMF_IMAINT = 0x2, /* the server has inherited the maintenance status from a tracked server */
SRV_ADMF_MAINT = 0x3, /* mask to check if any maintenance flag is present */
SRV_ADMF_FDRAIN = 0x4, /* the server was explicitly forced into drain state */
SRV_ADMF_IDRAIN = 0x8, /* the server has inherited the drain status from a tracked server */
SRV_ADMF_DRAIN = 0xC, /* mask to check if any drain flag is present */
SRV_ADMF_FMAINT = 0x01, /* the server was explicitly forced into maintenance */
SRV_ADMF_IMAINT = 0x02, /* the server has inherited the maintenance status from a tracked server */
SRV_ADMF_CMAINT = 0x04, /* the server is in maintenance because of the configuration */
SRV_ADMF_MAINT = 0x07, /* mask to check if any maintenance flag is present */
SRV_ADMF_FDRAIN = 0x08, /* the server was explicitly forced into drain state */
SRV_ADMF_IDRAIN = 0x10, /* the server has inherited the drain status from a tracked server */
SRV_ADMF_DRAIN = 0x18, /* mask to check if any drain flag is present */
};
/* server flags */

1
src/server.c
View File

@ -1294,6 +1294,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
cur_arg += 1;
}
else if (!defsrv && !strcmp(args[cur_arg], "disabled")) {
newsrv->admin |= SRV_ADMF_CMAINT;
newsrv->admin |= SRV_ADMF_FMAINT;
newsrv->state = SRV_ST_STOPPED;
newsrv->check.state |= CHK_ST_PAUSED;