Skip to content

Commit 3352f40

Browse files
Add ManagerPersister for persisting ChannelManagers
1 parent 804e658 commit 3352f40

File tree

2 files changed

+241
-0
lines changed

2 files changed

+241
-0
lines changed

lightning-persister/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
pub mod manager;
12
pub(crate) mod utils;
23

34
extern crate lightning;

lightning-persister/src/manager.rs

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
use crate::utils;
2+
use crate::utils::DiskWriteable;
3+
use lightning::chain;
4+
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
5+
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
6+
use lightning::ln::channelmanager::ChannelManager;
7+
use lightning::util::logger::Logger;
8+
use lightning::util::ser::Writeable;
9+
use std::fs;
10+
use std::mem;
11+
use std::sync::Arc;
12+
use std::sync::mpsc::{self, Sender, TryRecvError};
13+
use std::thread;
14+
use std::time::{Duration, SystemTime};
15+
16+
impl<ChanSigner: ChannelKeys + Writeable, M: chain::Watch<Keys=ChanSigner>, T: BroadcasterInterface, K: KeysInterface<ChanKeySigner=ChanSigner>, F: FeeEstimator, L: Logger> DiskWriteable for Arc<ChannelManager<ChanSigner, Arc<M>, Arc<T>, Arc<K>, Arc<F>, Arc<L>>> {
17+
fn write_to_file(&self, writer: &mut fs::File) -> Result<(), std::io::Error> {
18+
self.write(writer)
19+
}
20+
}
21+
22+
/// ManagerPersister runs a background thread that monitors whether the ChannelManager it's given on
23+
/// start has new updates to persist. If it does, then it writes said ChannelManager to disk/backups.
24+
pub struct ManagerPersister {
25+
#[cfg(test)]
26+
path_to_manager: String,
27+
28+
#[cfg(test)]
29+
pub thread_terminator: Sender<()>,
30+
#[cfg(not(test))]
31+
/// Used to send a message to the thread in ManagerPersister::start() to exit the thread.
32+
thread_terminator: Sender<()>,
33+
}
34+
35+
impl ManagerPersister {
36+
/// Start the background thread that checks whether new updates are available for the ChannelManager,
37+
/// and writes it to disk if so.
38+
/// We also call ChannelManager::timer_chan_freshness_every_min(), since we're already eating the
39+
/// cost of running a thread, we may as well pack as many operations into it as make sense.
40+
pub fn start<ChanSigner: 'static + ChannelKeys + Writeable, M: 'static + chain::Watch<Keys=ChanSigner>, T: 'static + BroadcasterInterface, K: 'static + KeysInterface<ChanKeySigner=ChanSigner>, F: 'static + FeeEstimator, L: 'static + Logger>(filepath: String, filename: String, manager: Arc<ChannelManager<ChanSigner, Arc<M>, Arc<T>, Arc<K>, Arc<F>, Arc<L>>>) -> Self {
41+
let (sender, receiver) = mpsc::channel();
42+
#[cfg(test)]
43+
let saved_filepath = filepath.clone();
44+
45+
let mutcond = Arc::clone(&manager.persistence_lock);
46+
// See ChannelMananger::persistence_lock for more documentation on the persistence process.
47+
thread::spawn(move || {
48+
let &(ref mtx, ref cvar) = &*mutcond;
49+
let mut current_time = SystemTime::now();
50+
loop {
51+
let mut guard = mtx.lock().unwrap();
52+
let result = cvar.wait_timeout(guard, Duration::from_millis(1000)).unwrap();
53+
guard = result.0;
54+
let saved_res = *guard;
55+
mem::drop(guard);
56+
if saved_res {
57+
if let Err(e) = utils::write_to_file(filepath.clone(), filename.clone(), &manager) {
58+
println!("Errored persisting manager: {}", e);
59+
};
60+
}
61+
// If we receive a message from the thread_terminator, we should exit now.
62+
match receiver.try_recv() {
63+
Ok(_) | Err(TryRecvError::Disconnected) => {
64+
println!("Terminating.");
65+
break;
66+
}
67+
Err(TryRecvError::Empty) => {}
68+
}
69+
match current_time.elapsed() {
70+
Ok(elapsed) => {
71+
if elapsed.as_secs() > 60 {
72+
manager.timer_chan_freshness_every_min();
73+
current_time = SystemTime::now();
74+
}
75+
},
76+
Err(e) => println!("Errored retrieving elapsed time: {}", e),
77+
}
78+
}
79+
});
80+
Self {
81+
#[cfg(test)]
82+
path_to_manager: saved_filepath,
83+
thread_terminator: sender,
84+
}
85+
}
86+
87+
pub fn stop(&self) {
88+
let _ = self.thread_terminator.send(());
89+
}
90+
}
91+
92+
#[cfg(test)]
93+
mod tests {
94+
use bitcoin::blockdata::constants::genesis_block;
95+
use bitcoin::blockdata::transaction::{Transaction, TxOut};
96+
use bitcoin::network::constants::Network;
97+
use lightning::chain::chainmonitor;
98+
use lightning::chain::keysinterface::{InMemoryChannelKeys, KeysManager};
99+
use lightning::chain::transaction::OutPoint;
100+
use lightning::get_event_msg;
101+
use lightning::ln::channelmanager::{ChannelManager, SimpleArcChannelManager};
102+
use lightning::ln::features::{InitFeatures};
103+
use lightning::ln::msgs::ChannelMessageHandler;
104+
use lightning::util::config::UserConfig;
105+
use lightning::util::events::{Event, EventsProvider, MessageSendEventsProvider, MessageSendEvent};
106+
use lightning::util::ser::{Writeable};
107+
use lightning::util::test_utils;
108+
use super::ManagerPersister;
109+
use crate::FilesystemPersister;
110+
use std::fs;
111+
use std::sync::{Arc, Mutex};
112+
use std::time::Duration;
113+
114+
impl Drop for ManagerPersister {
115+
fn drop(&mut self) {
116+
// We test for invalid directory names, so it's OK if directory removal
117+
// fails.
118+
match fs::remove_dir_all(&self.path_to_manager) {
119+
Err(e) => println!("Failed to remove test persister directory: {}", e),
120+
_ => {}
121+
}
122+
}
123+
}
124+
125+
type ChainMonitor = chainmonitor::ChainMonitor<InMemoryChannelKeys, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;
126+
127+
struct Node {
128+
node: SimpleArcChannelManager<ChainMonitor, test_utils::TestBroadcaster, test_utils::TestFeeEstimator, test_utils::TestLogger>,
129+
}
130+
131+
fn create_nodes(num_nodes: usize) -> Vec<Node> {
132+
let mut nodes = Vec::new();
133+
for i in 0..num_nodes {
134+
let tx_broadcaster = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new())});
135+
let fee_estimator = Arc::new(test_utils::TestFeeEstimator { sat_per_kw: 253 });
136+
let chain_source = Arc::new(test_utils::TestChainSource::new(Network::Testnet));
137+
let logger = Arc::new(test_utils::TestLogger::with_id(format!("node {}", i)));
138+
let monitor_persister = Arc::new(FilesystemPersister::new(format!("monitor_persister_{}", i)));
139+
let seed = [i as u8; 32];
140+
let network = Network::Testnet;
141+
let now = Duration::from_secs(genesis_block(network).header.time as u64);
142+
let keys_manager = Arc::new(KeysManager::new(&seed, network, now.as_secs(), now.subsec_nanos()));
143+
let chain_monitor = Arc::new(chainmonitor::ChainMonitor::new(Some(chain_source.clone()), tx_broadcaster.clone(), logger.clone(), fee_estimator.clone(), monitor_persister.clone()));
144+
let manager = Arc::new(ChannelManager::new(Network::Testnet, fee_estimator.clone(), chain_monitor.clone(), tx_broadcaster, logger.clone(), keys_manager.clone(), UserConfig::default(), i));
145+
let node = Node { node: manager };
146+
nodes.push(node);
147+
}
148+
nodes
149+
}
150+
151+
#[cfg(not(target_os = "windows"))]
152+
#[test]
153+
fn test_manager_persister() {
154+
let nodes = create_nodes(2);
155+
156+
// Initiate the persisters to watch each node.
157+
let _persister_0 = ManagerPersister::start("persister_0".to_string(), "manager".to_string(), nodes[0].node.clone());
158+
let _persister_1 = ManagerPersister::start("persister_1".to_string(), "manager".to_string(), nodes[1].node.clone());
159+
160+
// Go through the channel creation process until each node should have something persisted.
161+
let channel_value = 100000;
162+
nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), channel_value, 100, 42, None).unwrap();
163+
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), InitFeatures::known(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
164+
nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), InitFeatures::known(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
165+
166+
let events = nodes[0].node.get_and_clear_pending_events();
167+
assert_eq!(events.len(), 1);
168+
let (temporary_channel_id, tx, funding_output) = match events[0] {
169+
Event::FundingGenerationReady { ref temporary_channel_id, ref channel_value_satoshis, ref output_script, user_channel_id } => {
170+
assert_eq!(*channel_value_satoshis, channel_value);
171+
assert_eq!(user_channel_id, 42);
172+
173+
let tx = Transaction { version: 1 as i32, lock_time: 0, input: Vec::new(), output: vec![TxOut {
174+
value: *channel_value_satoshis, script_pubkey: output_script.clone(),
175+
}]};
176+
let funding_outpoint = OutPoint { txid: tx.txid(), index: 0 };
177+
(*temporary_channel_id, tx, funding_outpoint)
178+
},
179+
_ => panic!("Unexpected event"),
180+
};
181+
182+
nodes[0].node.funding_transaction_generated(&temporary_channel_id, funding_output);
183+
nodes[1].node.handle_funding_created(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendFundingCreated, nodes[1].node.get_our_node_id()));
184+
nodes[0].node.handle_funding_signed(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendFundingSigned, nodes[0].node.get_our_node_id()));
185+
186+
macro_rules! check_persisted_data {
187+
($node: expr, $filepath: expr) => {
188+
let bytes = loop {
189+
match std::fs::read($filepath) {
190+
Ok(bytes) => break bytes,
191+
Err(_) => continue
192+
}
193+
};
194+
let mut expected_bytes = Vec::new();
195+
assert!($node.write(&mut expected_bytes).is_ok());
196+
assert_eq!(bytes, expected_bytes);
197+
}
198+
}
199+
200+
// Check that the initial channel manager data is persisted as expected.
201+
check_persisted_data!(nodes[0].node, "./persister_0/manager");
202+
check_persisted_data!(nodes[1].node, "./persister_1/manager");
203+
204+
// Save the current bytes then trigger another update.
205+
let current_bytes = std::fs::read("./persister_0/manager").unwrap();
206+
207+
// Force-close the channel.
208+
nodes[0].node.force_close_channel(&OutPoint { txid: tx.txid(), index: 0 }.to_channel_id());
209+
210+
// Loop until what's written on disk changes.
211+
loop {
212+
match std::fs::read("./persister_0/manager") {
213+
Ok(bytes) => {
214+
if bytes == current_bytes { continue } else { break }
215+
},
216+
Err(_) => continue
217+
}
218+
};
219+
// Make sure the update was persisted properly.
220+
check_persisted_data!(nodes[0].node, "./persister_0/manager");
221+
// TODO(val): `Drop` is never called on the FilesystemPersisters (causing their directories to linger). why?
222+
let _ = fs::remove_dir_all("./monitor_persister_0");
223+
let _ = fs::remove_dir_all("./monitor_persister_1");
224+
}
225+
226+
#[test]
227+
fn test_stop_persister_bg_thread() {
228+
let nodes = create_nodes(1);
229+
let persister_0 = ManagerPersister::start("persister_0".to_string(), "manager".to_string(), nodes[0].node.clone());
230+
231+
// Stop the persister and check that it terminated.
232+
persister_0.stop();
233+
loop {
234+
match persister_0.thread_terminator.send(()) {
235+
Err(_) => break, // A send operation can only fail if the receiving end is disconnected.
236+
Ok(()) => continue
237+
}
238+
}
239+
}
240+
}

0 commit comments

Comments
 (0)