gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

De-dup ledgers - db_ledger is now the only ledger written to disk

Browse Source
This commit is contained in:
Michael Vines
2019-01-03 21:29:21 -08:00
parent b7bd38744c
commit 1f6346d880
17 changed files with 298 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ledger-tool/src/main.rs
View File

@@ -1,6 +1,6 @@
use clap::{crate_version, App, Arg, SubCommand};
use solana::bank::Bank;
use solana::ledger::{read_ledger, verify_ledger};
use solana::db_ledger::DbLedger;
use std::io::{stdout, Write};
use std::process::exit;
@@ -33,12 +33,6 @@ fn main() {
.takes_value(true)
.help("Skip entries with fewer than NUM hashes\n (only applies to print and json commands)"),
)
.arg(
Arg::with_name("precheck")
.short("p")
.long("precheck")
.help("Use ledger_verify() to check internal ledger consistency before proceeding"),
)
.arg(
Arg::with_name("continue")
.short("c")
@@ -52,21 +46,22 @@ fn main() {
let ledger_path = matches.value_of("ledger").unwrap();
if matches.is_present("precheck") {
if let Err(e) = verify_ledger(&ledger_path) {
eprintln!("ledger precheck failed, error: {:?} ", e);
exit(1);
}
}
let entries = match read_ledger(ledger_path, true) {
Ok(entries) => entries,
let db_ledger = match DbLedger::open(ledger_path) {
Ok(db_ledger) => db_ledger,
Err(err) => {
eprintln!("Failed to open ledger at {}: {}", ledger_path, err);
exit(1);
}
};
let mut entries = match db_ledger.read_ledger() {
Ok(entries) => entries,
Err(err) => {
eprintln!("Failed to read ledger at {}: {}", ledger_path, err);
exit(1);
}
};
let head = match matches.value_of("head") {
Some(head) => head.parse().expect("please pass a number for --head"),
None => <usize>::max_value(),
@@ -81,18 +76,11 @@ fn main() {
match matches.subcommand() {
("print", _) => {
let entries = match read_ledger(ledger_path, true) {
Ok(entries) => entries,
Err(err) => {
eprintln!("Failed to open ledger at {}: {}", ledger_path, err);
exit(1);
}
};
for (i, entry) in entries.enumerate() {
if i >= head {
break;
}
let entry = entry.unwrap();
if entry.num_hashes < min_hashes {
continue;
}
@@ -105,7 +93,7 @@ fn main() {
if i >= head {
break;
}
let entry = entry.unwrap();
if entry.num_hashes < min_hashes {
continue;
}
@@ -125,15 +113,7 @@ fn main() {
}
let bank = Bank::new_with_builtin_programs();
{
let genesis = match read_ledger(ledger_path, true) {
Ok(entries) => entries,
Err(err) => {
eprintln!("Failed to open ledger at {}: {}", ledger_path, err);
exit(1);
}
};
let genesis = genesis.take(NUM_GENESIS_ENTRIES).map(|e| e.unwrap());
let genesis = entries.by_ref().take(NUM_GENESIS_ENTRIES);
if let Err(e) = bank.process_ledger(genesis) {
eprintln!("verify failed at genesis err: {:?}", e);
if !matches.is_present("continue") {
@@ -141,13 +121,11 @@ fn main() {
}
}
}
let entries = entries.map(|e| e.unwrap());
let head = head - NUM_GENESIS_ENTRIES;
let mut last_id = bank.last_id();
for (i, entry) in entries.skip(NUM_GENESIS_ENTRIES).enumerate() {
for (i, entry) in entries.enumerate() {
if i >= head {
break;
}