Skip to content

Prevent slow chain polls from starving fee updates #1146

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

Open
benthecarman wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −40
Open

Prevent slow chain polls from starving fee updates #1146

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
76 changes: 36 additions & 40 deletions src/chain/bitcoind.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,11 @@ impl BitcoindChainSource {
tokio::time::interval(Duration::from_secs(CHAIN_POLLING_INTERVAL_SECS));
chain_polling_interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);

let mut fee_rate_update_interval =
tokio::time::interval(Duration::from_secs(CHAIN_POLLING_INTERVAL_SECS));
// When starting up, we just blocked on updating, so skip the first tick.
fee_rate_update_interval.reset();
fee_rate_update_interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);

log_info!(self.logger, "Starting continuous polling for chain updates.");

// Start the polling loop.
// Start the polling loop. We update fee rate estimates on the same tick right after polling
// for chain data, as using separate timers would allow chain polls taking longer than the
// polling interval to starve the fee rate updates.
let mut last_best_block_hash = None;
loop {
tokio::select! {
Expand All @@ -354,40 +350,40 @@ impl BitcoindChainSource {
);
return;
}
_ = chain_polling_interval.tick() => {
tokio::select! {
biased;
_ = stop_sync_receiver.changed() => {
log_trace!(
self.logger,
"Stopping polling for new chain data.",
);
return;
}
_ = self.poll_and_update_listeners(
Arc::clone(&onchain_wallet),
Arc::clone(&channel_manager),
Arc::clone(&chain_monitor),
Arc::clone(&output_sweeper)
) => {}
}
_ = chain_polling_interval.tick() => {}
}

tokio::select! {
biased;
_ = stop_sync_receiver.changed() => {
log_trace!(
self.logger,
"Stopping polling for new chain data.",
);
return;
}
_ = fee_rate_update_interval.tick() => {
if last_best_block_hash != Some(channel_manager.current_best_block().block_hash) {
tokio::select! {
biased;
_ = stop_sync_receiver.changed() => {
log_trace!(
self.logger,
"Stopping polling for new chain data.",
);
return;
}
update_res = self.update_fee_rate_estimates() => {
if update_res.is_ok() {
last_best_block_hash = Some(channel_manager.current_best_block().block_hash);
}
}
_ = self.poll_and_update_listeners(
Arc::clone(&onchain_wallet),
Arc::clone(&channel_manager),
Arc::clone(&chain_monitor),
Arc::clone(&output_sweeper)
) => {}
}

let current_best_block_hash = channel_manager.current_best_block().block_hash;
if last_best_block_hash != Some(current_best_block_hash) {
tokio::select! {
biased;
_ = stop_sync_receiver.changed() => {
log_trace!(
self.logger,
"Stopping polling for new chain data.",
);
return;
}
update_res = self.update_fee_rate_estimates() => {
if update_res.is_ok() {
last_best_block_hash = Some(current_best_block_hash);
}
}
}
Expand Down
Loading