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

get_new_blockhash() now retries longer (5s instead of 2s) (#6143) (#6150)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2019-09-27 11:27:43 -07:00
committed by Grimes
parent b8f680d1e7
commit 8f27240211
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/rpc_client.rs
View File

@ -396,9 +396,9 @@ impl RpcClient {
} }
pub fn get_new_blockhash(&self, blockhash: &Hash) -> io::Result<(Hash, FeeCalculator)> { pub fn get_new_blockhash(&self, blockhash: &Hash) -> io::Result<(Hash, FeeCalculator)> {
let mut num_retries = 10; let mut num_retries = 0;
let start = Instant::now(); let start = Instant::now();
while num_retries > 0 { while start.elapsed().as_secs() < 5 {
if let Ok((new_blockhash, fee_calculator)) = self.get_recent_blockhash() { if let Ok((new_blockhash, fee_calculator)) = self.get_recent_blockhash() {
if new_blockhash != *blockhash { if new_blockhash != *blockhash {
return Ok((new_blockhash, fee_calculator)); return Ok((new_blockhash, fee_calculator));
@ -410,13 +410,14 @@ impl RpcClient {
sleep(Duration::from_millis( sleep(Duration::from_millis(
500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND, 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND,
)); ));
num_retries -= 1; num_retries += 1;
} }
Err(io::Error::new( Err(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
format!( format!(
"Unable to get new blockhash after {}ms, stuck at {}", "Unable to get new blockhash after {}ms (retried {} times), stuck at {}",
start.elapsed().as_millis(), start.elapsed().as_millis(),
num_retries,
blockhash blockhash
), ),
)) ))