Fix test stalling (#11212)

Co-authored-by: Carl <carl@solana.com>
This commit is contained in:
carllin 2020-07-25 21:30:08 -07:00 committed by GitHub
parent 01ff6846f7
commit b7d8e256a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions

View File

@ -324,20 +324,27 @@ pub fn check_no_new_roots(
let end_slot = max_slot + num_slots_to_wait as u64; let end_slot = max_slot + num_slots_to_wait as u64;
let mut current_slot; let mut current_slot;
let mut last_print = Instant::now(); let mut last_print = Instant::now();
let client = create_client(contact_infos[0].client_facing_addr(), VALIDATOR_PORT_RANGE); let mut reached_end_slot = false;
loop { loop {
current_slot = client for contact_info in contact_infos {
.get_slot_with_commitment(CommitmentConfig::recent()) let client = create_client(contact_info.client_facing_addr(), VALIDATOR_PORT_RANGE);
.unwrap_or_else(|_| panic!("get_slot for {} failed", contact_infos[0].id)); current_slot = client
if current_slot > end_slot { .get_slot_with_commitment(CommitmentConfig::recent())
break; .unwrap_or_else(|_| panic!("get_slot for {} failed", contact_infos[0].id));
if current_slot > end_slot {
reached_end_slot = true;
break;
}
if last_print.elapsed().as_secs() > 3 {
info!(
"{} current slot: {} on validator: {}, waiting for any validator with slot: {}",
test_name, current_slot, contact_info.id, end_slot
);
last_print = Instant::now();
}
} }
if last_print.elapsed().as_secs() > 3 { if reached_end_slot {
info!( break;
"{} current slot: {}, waiting for slot: {}",
test_name, current_slot, end_slot
);
last_print = Instant::now();
} }
} }