DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-03 18:45:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

sources: enable no majority message before first selection

Browse Source 
Add a separate flag to allow the "no majority" message to be logged even
before the first successful selection.
This commit is contained in:
Miroslav Lichvar
2023-01-26 16:12:26 +01:00
parent bd37efa52e
commit dc0f0cd134
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources.c
View File

@@ -165,6 +165,8 @@ static int max_n_sources; /* Capacity of the table */
static int selected_source_index; /* Which source index is currently static int selected_source_index; /* Which source index is currently
selected (set to INVALID_SOURCE selected (set to INVALID_SOURCE
if no current valid reference) */ if no current valid reference) */
static int reported_no_majority; /* Flag to avoid repeated log message
about no majority */
/* Score needed to replace the currently selected source */ /* Score needed to replace the currently selected source */
#define SCORE_LIMIT 10.0 #define SCORE_LIMIT 10.0
@@ -1083,8 +1085,12 @@ SRC_SelectSource(SRC_Instance updated_inst)
(best_trust_depth > 0 && best_trust_depth <= n_sel_trust_sources / 2)) { (best_trust_depth > 0 && best_trust_depth <= n_sel_trust_sources / 2)) {
/* Could not even get half the reachable (trusted) sources to agree */ /* Could not even get half the reachable (trusted) sources to agree */
if (selected_source_index != INVALID_SOURCE) { if (!reported_no_majority) {
log_selection_message(LOGS_WARN, "Can't synchronise: no majority", NULL); log_selection_message(LOGS_WARN, "Can't synchronise: no majority", NULL);
reported_no_majority = 1;
}
if (selected_source_index != INVALID_SOURCE) {
REF_SetUnsynchronised(); REF_SetUnsynchronised();
selected_source_index = INVALID_SOURCE; selected_source_index = INVALID_SOURCE;
} }
@@ -1259,6 +1265,8 @@ SRC_SelectSource(SRC_Instance updated_inst)
sources[i]->sel_score = 1.0; sources[i]->sel_score = 1.0;
sources[i]->distant = 0; sources[i]->distant = 0;
} }
reported_no_majority = 0;
} }
mark_source(sources[selected_source_index], SRC_SELECTED); mark_source(sources[selected_source_index], SRC_SELECTED);