blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add --no-genesis-fetch flag (#6893)

This commit is contained in:
Michael Vines 2019-11-12 10:42:04 -07:00 committed by GitHub
parent bb2fa9957a
commit 4bc8fd3267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
validator/src/main.rs
View File

@ -171,6 +171,7 @@ fn download_tar_bz2(
fn initialize_ledger_path( fn initialize_ledger_path(
entrypoint: &ContactInfo, entrypoint: &ContactInfo,
ledger_path: &Path, ledger_path: &Path,
no_genesis_fetch: bool,
no_snapshot_fetch: bool, no_snapshot_fetch: bool,
) -> Result<Hash, String> { ) -> Result<Hash, String> {
let (nodes, _archivers) = discover( let (nodes, _archivers) = discover(
@ -208,7 +209,9 @@ fn initialize_ledger_path(
fs::create_dir_all(ledger_path).map_err(|err| err.to_string())?; fs::create_dir_all(ledger_path).map_err(|err| err.to_string())?;
download_tar_bz2(&rpc_addr, "genesis.tar.bz2", ledger_path, true)?; if !no_genesis_fetch {
download_tar_bz2(&rpc_addr, "genesis.tar.bz2", ledger_path, true)?;
}
if !no_snapshot_fetch { if !no_snapshot_fetch {
let snapshot_package = solana_ledger::snapshot_utils::get_snapshot_tar_path(ledger_path); let snapshot_package = solana_ledger::snapshot_utils::get_snapshot_tar_path(ledger_path);
@ -312,6 +315,13 @@ pub fn main() {
.requires("entrypoint") .requires("entrypoint")
.help("Do not attempt to fetch a new snapshot from the cluster entrypoint, start from a local snapshot if present"), .help("Do not attempt to fetch a new snapshot from the cluster entrypoint, start from a local snapshot if present"),
) )
.arg(
Arg::with_name("no_genesis_fetch")
.long("no-genesis-fetch")
.takes_value(false)
.requires("entrypoint")
.help("Do not attempt to fetch a new genesis from the cluster entrypoint, start from a local genesis if present"),
)
.arg( .arg(
Arg::with_name("no_voting") Arg::with_name("no_voting")
.long("no-voting") .long("no-voting")
@ -463,6 +473,7 @@ pub fn main() {
let init_complete_file = matches.value_of("init_complete_file"); let init_complete_file = matches.value_of("init_complete_file");
let skip_poh_verify = matches.is_present("skip_poh_verify"); let skip_poh_verify = matches.is_present("skip_poh_verify");
let cuda = matches.is_present("cuda"); let cuda = matches.is_present("cuda");
let no_genesis_fetch = matches.is_present("no_genesis_fetch");
let no_snapshot_fetch = matches.is_present("no_snapshot_fetch"); let no_snapshot_fetch = matches.is_present("no_snapshot_fetch");
let rpc_port = value_t!(matches, "rpc_port", u16); let rpc_port = value_t!(matches, "rpc_port", u16);
@ -641,12 +652,16 @@ pub fn main() {
&udp_sockets, &udp_sockets,
); );
let genesis_hash = let genesis_hash = initialize_ledger_path(
initialize_ledger_path(cluster_entrypoint, &ledger_path, no_snapshot_fetch) cluster_entrypoint,
.unwrap_or_else(|err| { &ledger_path,
error!("Failed to download ledger: {}", err); no_genesis_fetch,
exit(1); no_snapshot_fetch,
}); )
.unwrap_or_else(|err| {
error!("Failed to download ledger: {}", err);
exit(1);
});
if let Some(expected_genesis_hash) = validator_config.expected_genesis_hash { if let Some(expected_genesis_hash) = validator_config.expected_genesis_hash {
if expected_genesis_hash != genesis_hash { if expected_genesis_hash != genesis_hash {