Skip to content

Drop verbose log entries in BP when no network graph is provided #1866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2022
Merged

Drop verbose log entries in BP when no network graph is provided #1866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ macro_rules! define_run_body {
// continuing our normal cadence.
if last_prune_call.elapsed().as_secs() > if have_pruned { NETWORK_PRUNE_TIMER } else { FIRST_NETWORK_PRUNE_TIMER } {
// The network graph must not be pruned while rapid sync completion is pending
log_trace!($logger, "Assessing prunability of network graph");
if let Some(network_graph) = $gossip_sync.prunable_network_graph() {
log_trace!($logger, "Pruning and persisting network graph.");
network_graph.remove_stale_channels_and_tracking();

if let Err(e) = $persister.persist_graph(network_graph) {
Expand All @@ -293,8 +293,6 @@ macro_rules! define_run_body {

last_prune_call = Instant::now();
have_pruned = true;
} else {
log_trace!($logger, "Not pruning network graph, either due to pending rapid gossip sync or absence of a prunable graph.");
}
}

Expand Down Expand Up @@ -1072,10 +1070,11 @@ mod tests {

loop {
let log_entries = nodes[0].logger.lines.lock().unwrap();
let expected_log_a = "Assessing prunability of network graph".to_string();
let expected_log_b = "Not pruning network graph, either due to pending rapid gossip sync or absence of a prunable graph.".to_string();
if log_entries.get(&("lightning_background_processor".to_string(), expected_log_a)).is_some() &&
log_entries.get(&("lightning_background_processor".to_string(), expected_log_b)).is_some() {
let loop_counter = "Calling ChannelManager's timer_tick_occurred".to_string();
if *log_entries.get(&("lightning_background_processor".to_string(), loop_counter))
.unwrap_or(&0) > 1
{
// Wait until the loop has gone around at least twice.
break
}
}
Expand Down