proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-08-03 08:13:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Two configuration attributes for SG objects were not handled

Browse Source 
correctly by the config parser. 


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1249 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Hans Feldt 2006-09-29 11:23:00 +00:00
parent 40066857bf
commit 2e86a93d45
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
exec/amfsg.c
View File

@ -1502,6 +1502,7 @@ struct amf_sg *amf_sg_new (struct amf_application *app, char *name)
sg->saAmfSGNumPrefActiveSUs = 1;
sg->saAmfSGNumPrefStandbySUs = 1;
sg->saAmfSGNumPrefInserviceSUs = ~0;
sg->saAmfSGNumPrefAssignedSUs = ~0;
sg->saAmfSGCompRestartProb = -1;
sg->saAmfSGCompRestartMax = ~0;
sg->saAmfSGSuRestartProb = -1;

8
exec/amfutil.c
View File

@ -463,6 +463,10 @@ struct amf_cluster *amf_config_read (char **error_string)
sg->saAmfSGNumPrefActiveSUs = atoi (loc);
} else if ((loc = strstr_rs (line, "saAmfSGNumPrefStandbySUs=")) != 0) {
sg->saAmfSGNumPrefStandbySUs = atoi (loc);
} else if ((loc = strstr_rs (line, "saAmfSGNumPrefInserviceSUs=")) != 0) {
sg->saAmfSGNumPrefInserviceSUs = atoi (loc);
} else if ((loc = strstr_rs (line, "saAmfSGNumPrefAssignedSUs=")) != 0) {
sg->saAmfSGNumPrefAssignedSUs = atoi (loc);
} else if ((loc = strstr_rs (line, "saAmfSGMaxActiveSIsperSUs=")) != 0) {
sg->saAmfSGMaxActiveSIsperSUs = atoi (loc);
} else if ((loc = strstr_rs (line, "saAmfSGMaxStandbySIsperSUs=")) != 0) {
@ -515,6 +519,10 @@ struct amf_cluster *amf_config_read (char **error_string)
if (sg->saAmfSGNumPrefInserviceSUs == ~0) {
sg->saAmfSGNumPrefInserviceSUs = su_cnt;
}
if (sg->saAmfSGNumPrefAssignedSUs == ~0) {
sg->saAmfSGNumPrefAssignedSUs =
sg->saAmfSGNumPrefInserviceSUs;
}
current_parse = AMF_APPLICATION;
} else {
goto parse_error;