Skip to content

Commit dac90af

Browse files
committed
Add reenatrancy guard for process_pending_htlc_forwards
We add a reenatrancy guard to disallow entering `process_pending_htlc_forwards` multiple times. This makes sure that we'd skip any additional processing calls if a prior round/batch of processing is still underway.
1 parent cf90ad5 commit dac90af

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2722,6 +2722,10 @@ pub struct ChannelManager<
27222722
/// A simple atomic flag to ensure only one task at a time can be processing events asynchronously.
27232723
pending_events_processor: AtomicBool,
27242724

2725+
/// A simple atomic flag to ensure only one task at a time can be processing HTLC forwards via
2726+
/// [`Self::process_pending_htlc_forwards`].
2727+
pending_htlc_forwards_processor: AtomicBool,
2728+
27252729
/// If we are running during init (either directly during the deserialization method or in
27262730
/// block connection methods which run after deserialization but before normal operation) we
27272731
/// cannot provide the user with [`ChannelMonitorUpdate`]s through the normal update flow -
@@ -3786,6 +3790,7 @@ where
37863790

37873791
pending_events: Mutex::new(VecDeque::new()),
37883792
pending_events_processor: AtomicBool::new(false),
3793+
pending_htlc_forwards_processor: AtomicBool::new(false),
37893794
pending_background_events: Mutex::new(Vec::new()),
37903795
total_consistency_lock: RwLock::new(()),
37913796
background_events_processed_since_startup: AtomicBool::new(false),
@@ -6365,9 +6370,19 @@ where
63656370
///
63666371
/// Will regularly be called by the background processor.
63676372
pub fn process_pending_htlc_forwards(&self) {
6373+
if self
6374+
.pending_htlc_forwards_processor
6375+
.compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
6376+
.is_err()
6377+
{
6378+
return;
6379+
}
6380+
63686381
let _persistence_guard = PersistenceNotifierGuard::optionally_notify(self, || {
63696382
self.internal_process_pending_htlc_forwards()
63706383
});
6384+
6385+
self.pending_htlc_forwards_processor.store(false, Ordering::Release);
63716386
}
63726387

63736388
// Returns whether or not we need to re-persist.
@@ -16445,6 +16460,7 @@ where
1644516460

1644616461
pending_events: Mutex::new(pending_events_read),
1644716462
pending_events_processor: AtomicBool::new(false),
16463+
pending_htlc_forwards_processor: AtomicBool::new(false),
1644816464
pending_background_events: Mutex::new(pending_background_events),
1644916465
total_consistency_lock: RwLock::new(()),
1645016466
background_events_processed_since_startup: AtomicBool::new(false),

0 commit comments

Comments
 (0)