Move db_ledger open from bin/replicator to src/replicator

src/bin/replicator.rs

@@ -10,7 +10,6 @@ use clap::{App, Arg};
 use solana::chacha::{chacha_cbc_encrypt_file, CHACHA_BLOCK_SIZE};
 use solana::client::mk_client;
 use solana::cluster_info::Node;
-use solana::db_ledger::DbLedger;
 use solana::fullnode::Config;
 use solana::ledger::LEDGER_DATA_FILE;
 use solana::logger;
@@ -24,7 +23,7 @@ use std::net::{Ipv4Addr, SocketAddr};
 use std::path::Path;
 use std::process::exit;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, RwLock};
+use std::sync::Arc;
 use std::thread::sleep;
 use std::time::Duration;
 
@@ -95,13 +94,7 @@ fn main() {
     // TODO: ask network what slice we should store
     let entry_height = 0;
 
-    // Create the RocksDb ledger, eventually will simply repurpose the input
-    // ledger path as the RocksDb ledger path
-    let db_ledger = Arc::new(RwLock::new(
-        DbLedger::open(&ledger_path.unwrap()).expect("Expected to be able to open database ledger"),
-    ));
     let (replicator, leader_info) = Replicator::new(
-        db_ledger,
         entry_height,
         5,
         &exit,

src/replicator.rs

@@ -72,7 +72,6 @@ pub fn sample_file(in_path: &Path, sample_offsets: &[u64]) -> io::Result<Hash> {
 
 impl Replicator {
     pub fn new(
-        db_ledger: Arc<RwLock<DbLedger>>,
         entry_height: u64,
         max_entry_height: u64,
         exit: &Arc<AtomicBool>,
@@ -106,6 +105,17 @@ impl Replicator {
         let (entry_window_sender, entry_window_receiver) = channel();
         // todo: pull blobs off the retransmit_receiver and recycle them?
         let (retransmit_sender, retransmit_receiver) = channel();
+
+        // Create the RocksDb ledger, eventually will simply repurpose the input
+        // ledger path as the RocksDb ledger path once we replace the ledger with
+        // RocksDb. Note for now, this ledger will not contain any of the existing entries
+        // in the ledger located at ledger_path, and will only append on newly received
+        // entries after being passed to window_service
+        let db_ledger = Arc::new(RwLock::new(
+            DbLedger::open(&ledger_path.unwrap())
+                .expect("Expected to be able to open database ledger"),
+        ));
+
         let t_window = window_service(
             db_ledger,
             cluster_info.clone(),
@@ -174,7 +184,6 @@ mod tests {
     use logger;
     use replicator::sample_file;
     use replicator::Replicator;
-    use rocksdb::{Options, DB};
     use signature::{Keypair, KeypairUtil};
     use solana_sdk::hash::Hash;
     use std::fs::File;
@@ -183,7 +192,7 @@ mod tests {
     use std::mem::size_of;
     use std::path::PathBuf;
     use std::sync::atomic::{AtomicBool, Ordering};
-    use std::sync::{Arc, RwLock};
+    use std::sync::Arc;
     use std::thread::sleep;
     use std::time::Duration;
 
@@ -232,12 +241,7 @@ mod tests {
 
         info!("starting replicator node");
         let replicator_node = Node::new_localhost_with_pubkey(replicator_keypair.pubkey());
-        let db_ledger_path = get_tmp_ledger_path("test_replicator_startup");
-        let db_ledger = Arc::new(RwLock::new(
-            DbLedger::open(&db_ledger_path).expect("Expected to be able to open database ledger"),
-        ));
         let (replicator, _leader_info) = Replicator::new(
-            db_ledger,
             entry_height,
             1,
             &exit,
@@ -275,9 +279,9 @@ mod tests {
         replicator.join();
         leader.exit();
 
-        DB::destroy(&Options::default(), &db_ledger_path)
+        DbLedger::destroy(&leader_ledger_path).expect("Expected successful database destuction");
+        DbLedger::destroy(&replicator_ledger_path)
             .expect("Expected successful database destuction");
-        let _ignored = remove_dir_all(&db_ledger_path);
         let _ignored = remove_dir_all(&leader_ledger_path);
         let _ignored = remove_dir_all(&replicator_ledger_path);
     }