mirrors/electrs
1
0
Fork 0
mirror of https://github.com/romanz/electrs.git synced 2024-11-19 09:54:09 +01:00
Code Issues Projects Releases Wiki Activity

Allow stopping bulk indexing via SIGINT/SIGTERM

Browse Source
This commit is contained in:
Roman Zeyde 2019-07-17 20:14:06 +03:00
parent 25ce69ea04
commit 35f456751f
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/electrs.rs
View File

@ -49,7 +49,8 @@ fn run_server(config: &Config) -> Result<()> {
full_compaction(store)
} else {
// faster, but uses more memory
let store = bulk::index_blk_files(&daemon, config.bulk_index_threads, &metrics, store)?;
let store =
bulk::index_blk_files(&daemon, config.bulk_index_threads, &metrics, &signal, store)?;
let store = full_compaction(store);
index.reload(&store); // make sure the block header index is up-to-date
store

12
src/bulk.rs
View File

@ -17,6 +17,7 @@ use crate::daemon::Daemon;
use crate::errors::*;
use crate::index::{index_block, last_indexed_block, read_indexed_blockhashes};
use crate::metrics::{CounterVec, Histogram, HistogramOpts, HistogramVec, MetricOpts, Metrics};
use crate::signal::Waiter;
use crate::store::{DBStore, Row, WriteStore};
use crate::util::{spawn_thread, HeaderList, SyncChannel};
@ -225,6 +226,7 @@ pub fn index_blk_files(
daemon: &Daemon,
index_threads: usize,
metrics: &Metrics,
signal: &Waiter,
store: DBStore,
) -> Result<DBStore> {
set_open_files_limit(2048); // twice the default `ulimit -n` value
@ -238,10 +240,14 @@ pub fn index_blk_files(
let indexers: Vec<JoinHandle> = (0..index_threads)
.map(|_| start_indexer(blobs.clone(), parser.clone(), rows_chan.sender()))
.collect();
Ok(spawn_thread("bulk_writer", move || -> DBStore {
let signal = signal.clone();
spawn_thread("bulk_writer", move || -> Result<DBStore> {
for (rows, path) in rows_chan.into_receiver() {
trace!("indexed {:?}: {} rows", path, rows.len());
store.write(rows);
signal
.poll()
.chain_err(|| "stopping bulk indexing due to signal")?;
}
reader
.join()
@ -254,10 +260,10 @@ pub fn index_blk_files(
.expect("indexing failed")
});
store.write(vec![parser.last_indexed_row()]);
store
Ok(store)
})
.join()
.expect("writer panicked"))
.expect("writer panicked")
}
#[cfg(test)]