Remove exit variable from WriteStage

This commit is contained in:
Greg Fitzgerald 2018-07-05 15:34:22 -06:00 committed by Greg Fitzgerald
parent 82c86daa78
commit 4bb7cefa15
2 changed files with 3 additions and 15 deletions

View File

@ -80,13 +80,8 @@ impl Tpu {
None => RecordStage::new(signal_receiver, &bank.last_id()), None => RecordStage::new(signal_receiver, &bank.last_id()),
}; };
let (write_stage, blob_receiver) = WriteStage::new( let (write_stage, blob_receiver) =
bank.clone(), WriteStage::new(bank.clone(), blob_recycler.clone(), writer, entry_receiver);
exit.clone(),
blob_recycler.clone(),
writer,
entry_receiver,
);
let tpu = Tpu { let tpu = Tpu {
fetch_stage, fetch_stage,

View File

@ -11,7 +11,6 @@ use result::{Error, Result};
use service::Service; use service::Service;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::io::Write; use std::io::Write;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::{channel, Receiver, RecvTimeoutError}; use std::sync::mpsc::{channel, Receiver, RecvTimeoutError};
use std::sync::Arc; use std::sync::Arc;
use std::thread::{self, Builder, JoinHandle}; use std::thread::{self, Builder, JoinHandle};
@ -46,7 +45,6 @@ impl WriteStage {
/// Create a new WriteStage for writing and broadcasting entries. /// Create a new WriteStage for writing and broadcasting entries.
pub fn new<W: Write + Send + 'static>( pub fn new<W: Write + Send + 'static>(
bank: Arc<Bank>, bank: Arc<Bank>,
exit: Arc<AtomicBool>,
blob_recycler: BlobRecycler, blob_recycler: BlobRecycler,
writer: W, writer: W,
entry_receiver: Receiver<Vec<Entry>>, entry_receiver: Receiver<Vec<Entry>>,
@ -65,15 +63,10 @@ impl WriteStage {
) { ) {
match e { match e {
Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break, Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
Error::SendError => break, Error::SendError => (), // Ignore when downstream stage exists prematurely.
_ => error!("{:?}", e), _ => error!("{:?}", e),
} }
}; };
if exit.load(Ordering::Relaxed) {
info!("broadcat_service exiting");
break;
}
} }
}) })
.unwrap(); .unwrap();