RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-29 14:46:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: server: server-state only rely on server name

Browse Source 
Since h7da71293e431b5ebb3d6289a55b0102331788ee6as has been added, the
server name (srv->id in the code) is now unique per backend, which
means it can reliabely be used to identify a server recovered from the
server-state file.

This patch cleans up the parsing of server-state file and ensure we use
only the server name as a reliable key.
This commit is contained in:
Baptiste Assmann 2019-06-11 14:51:49 +02:00 committed by Willy Tarreau
parent 3b44c54129
commit 95c2c01ced
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/server.c
View File

@ -3384,7 +3384,7 @@ void apply_server_state(void)
int mybuflen;
char *params[SRV_STATE_FILE_MAX_FIELDS] = {0};
char *srv_params[SRV_STATE_FILE_MAX_FIELDS] = {0};
int arg, srv_arg, version, diff;
int arg, srv_arg, version;
FILE *f;
char *filepath;
char globalfilepath[MAXPATHLEN + 1];
@ -3629,7 +3629,6 @@ void apply_server_state(void)
break;
}
diff = 0;
bk = curproxy;
/* if backend can't be found, let's continue */
@ -3648,27 +3647,15 @@ void apply_server_state(void)
continue;
}
/* look for the server by its id: param[2] */
/* else look for the server by its name: param[3] */
diff = 0;
srv = server_find_best_match(bk, params[3], atoi(params[2]), &diff);
/* look for the server by its name: param[3] */
srv = server_find_best_match(bk, params[3], 0, NULL);
if (!srv) {
/* if no server found, then warning and continue with next line */
ha_warning("can't find server '%s' with id '%s' in backend with id '%s' or name '%s'\n",
params[3], params[2], params[0], params[1]);
send_log(bk, LOG_NOTICE, "can't find server '%s' with id '%s' in backend with id '%s' or name '%s'\n",
params[3], params[2], params[0], params[1]);
continue;
}
else if (diff & PR_FBM_MISMATCH_ID) {
ha_warning("In backend '%s' (id: '%d'): server ID mismatch: from server state file: '%s', from running config %d\n", bk->id, bk->uuid, params[2], srv->puid);
send_log(bk, LOG_NOTICE, "In backend '%s' (id: %d): server ID mismatch: from server state file: '%s', from running config %d\n", bk->id, bk->uuid, params[2], srv->puid);
continue;
}
else if (diff & PR_FBM_MISMATCH_NAME) {
ha_warning("In backend '%s' (id: %d): server name mismatch: from server state file: '%s', from running config '%s'\n", bk->id, bk->uuid, params[3], srv->id);
send_log(bk, LOG_NOTICE, "In backend '%s' (id: %d): server name mismatch: from server state file: '%s', from running config '%s'\n", bk->id, bk->uuid, params[3], srv->id);
ha_warning("can't find server '%s' in backend '%s'\n",
params[3], params[1]);
send_log(bk, LOG_NOTICE, "can't find server '%s' in backend '%s'\n",
params[3], params[1]);
continue;
}