faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sources: require majority for trusted sources

Browse source 
Handle trusted sources as a separate set of sources which is required to
have a majority for the selection to proceed. This should improve the
selection with multiple trusted sources (e.g. due to the auth selection
mode).
This commit is contained in:
Miroslav Lichvar 2020-06-02 18:54:41 +02:00
parent 1e68671690
commit faff931a76
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sources.c
View file

@ -755,7 +755,7 @@ SRC_SelectSource(SRC_Instance updated_inst)
struct timespec now, ref_time; struct timespec now, ref_time;
int i, j, j1, j2, index, sel_prefer, n_endpoints, n_sel_sources, sel_req_source; int i, j, j1, j2, index, sel_prefer, n_endpoints, n_sel_sources, sel_req_source;
int n_badstats_sources, max_sel_reach, max_sel_reach_size, max_badstat_reach; int n_badstats_sources, max_sel_reach, max_sel_reach_size, max_badstat_reach;
int depth, best_depth, trust_depth, best_trust_depth; int depth, best_depth, trust_depth, best_trust_depth, n_sel_trust_sources;
int combined, stratum, min_stratum, max_score_index; int combined, stratum, min_stratum, max_score_index;
int orphan_stratum, orphan_source; int orphan_stratum, orphan_source;
double src_offset, src_offset_sd, src_frequency, src_frequency_sd, src_skew; double src_offset, src_offset_sd, src_frequency, src_frequency_sd, src_skew;
@ -783,7 +783,7 @@ SRC_SelectSource(SRC_Instance updated_inst)
/* Step 1 - build intervals about each source */ /* Step 1 - build intervals about each source */
n_endpoints = 0; n_endpoints = 0;
n_sel_sources = 0; n_sel_sources = n_sel_trust_sources = 0;
n_badstats_sources = 0; n_badstats_sources = 0;
sel_req_source = 0; sel_req_source = 0;
max_sel_reach = max_badstat_reach = 0; max_sel_reach = max_badstat_reach = 0;
@ -918,6 +918,9 @@ SRC_SelectSource(SRC_Instance updated_inst)
if (sources[i]->status != SRC_OK) if (sources[i]->status != SRC_OK)
continue; continue;
if (sources[i]->sel_options & SRC_SELECT_TRUST)
n_sel_trust_sources++;
si = &sources[i]->sel_info; si = &sources[i]->sel_info;
j1 = n_endpoints; j1 = n_endpoints;
@ -1023,9 +1026,9 @@ SRC_SelectSource(SRC_Instance updated_inst)
} }
} }
if (best_depth <= n_sel_sources / 2 && !best_trust_depth) { if ((best_trust_depth == 0 && best_depth <= n_sel_sources / 2) ||
/* Could not even get half the reachable sources to agree and there (best_trust_depth > 0 && best_trust_depth <= n_sel_trust_sources / 2)) {
are no trusted sources - clearly we can't synchronise */ /* Could not even get half the reachable (trusted) sources to agree */
if (selected_source_index != INVALID_SOURCE) { if (selected_source_index != INVALID_SOURCE) {
log_selection_message("Can't synchronise: no majority", NULL); log_selection_message("Can't synchronise: no majority", NULL);

2
test/unit/sources.c
View file

@ -131,7 +131,7 @@ test_unit(void)
trusted_passed, trusted, required_passed, required); trusted_passed, trusted, required_passed, required);
TEST_CHECK(!trusted || !passed || (passed_lo >= trusted_lo && passed_hi <= trusted_hi)); TEST_CHECK(!trusted || !passed || (passed_lo >= trusted_lo && passed_hi <= trusted_hi));
TEST_CHECK(!passed || trusted != 1 || (trusted == 1 && trusted_passed == 1)); TEST_CHECK(!passed || !trusted || trusted_passed >= 1);
TEST_CHECK(!passed || !required || required_passed > 0); TEST_CHECK(!passed || !required || required_passed > 0);
} }
} }