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

Add --enable-bigtable-ledger-upload flag

Browse Source
This commit is contained in:
Michael Vines
2020-09-03 11:30:21 -07:00
committed by mergify[bot]
parent 7b7b7be99c
commit 6101c1d690
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/rpc.rs
View File

@ -87,6 +87,7 @@ pub struct JsonRpcConfig {
pub faucet_addr: Option<SocketAddr>, pub faucet_addr: Option<SocketAddr>,
pub health_check_slot_distance: u64, pub health_check_slot_distance: u64,
pub enable_bigtable_ledger_storage: bool, pub enable_bigtable_ledger_storage: bool,
pub enable_bigtable_ledger_upload: bool,
} }
#[derive(Clone)] #[derive(Clone)]

32
core/src/rpc_service.rs
View File

@ -272,20 +272,24 @@ impl JsonRpcService {
.build() .build()
.expect("Runtime"); .expect("Runtime");
let bigtable_ledger_storage = if config.enable_bigtable_ledger_storage { let bigtable_ledger_storage =
runtime if config.enable_bigtable_ledger_storage || config.enable_bigtable_ledger_upload {
.block_on(solana_storage_bigtable::LedgerStorage::new(false)) runtime
.map(|x| { .block_on(solana_storage_bigtable::LedgerStorage::new(
info!("BigTable ledger storage initialized"); config.enable_bigtable_ledger_upload,
Some(x) ))
}) .map(|x| {
.unwrap_or_else(|err| { info!("BigTable ledger storage initialized");
error!("Failed to initialize BigTable ledger storage: {:?}", err); Some(x)
None })
}) .unwrap_or_else(|err| {
} else { error!("Failed to initialize BigTable ledger storage: {:?}", err);
None None
}; })
} else {
None
};
let request_processor = JsonRpcRequestProcessor::new( let request_processor = JsonRpcRequestProcessor::new(
config, config,
bank_forks.clone(), bank_forks.clone(),

8
validator/src/main.rs
View File

@ -653,6 +653,13 @@ pub fn main() {
.help("Fetch historical transaction info from a BigTable instance \ .help("Fetch historical transaction info from a BigTable instance \
as a fallback to local ledger data"), as a fallback to local ledger data"),
) )
.arg(
Arg::with_name("enable_bigtable_ledger_upload")
.long("enable-bigtable-ledger-upload")
.requires("enable_rpc_transaction_history")
.takes_value(false)
.help("Upload new confirmed blocks into a BigTable instance"),
)
.arg( .arg(
Arg::with_name("health_check_slot_distance") Arg::with_name("health_check_slot_distance")
.long("health-check-slot-distance") .long("health-check-slot-distance")
@ -970,6 +977,7 @@ pub fn main() {
enable_rpc_transaction_history: matches.is_present("enable_rpc_transaction_history"), enable_rpc_transaction_history: matches.is_present("enable_rpc_transaction_history"),
enable_bigtable_ledger_storage: matches enable_bigtable_ledger_storage: matches
.is_present("enable_rpc_bigtable_ledger_storage"), .is_present("enable_rpc_bigtable_ledger_storage"),
enable_bigtable_ledger_upload: matches.is_present("enable_bigtable_ledger_upload"),
identity_pubkey: identity_keypair.pubkey(), identity_pubkey: identity_keypair.pubkey(),
faucet_addr: matches.value_of("rpc_faucet_addr").map(|address| { faucet_addr: matches.value_of("rpc_faucet_addr").map(|address| {
solana_net_utils::parse_host_port(address).expect("failed to parse faucet address") solana_net_utils::parse_host_port(address).expect("failed to parse faucet address")