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

Adapt to v1.2

Browse Source
This commit is contained in:
Michael Vines
2020-09-04 18:49:48 +00:00
committed by mergify[bot]
parent 096d9ce5c7
commit acfd72d7c4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/bigtable_upload_service.rs
View File

@@ -1,5 +1,5 @@
use crate::commitment::BlockCommitmentCache;
use solana_ledger::blockstore::Blockstore; use solana_ledger::blockstore::Blockstore;
use solana_runtime::commitment::BlockCommitmentCache;
use std::{ use std::{
sync::atomic::{AtomicBool, Ordering}, sync::atomic::{AtomicBool, Ordering},
sync::{Arc, RwLock}, sync::{Arc, RwLock},
@@ -49,12 +49,12 @@ impl BigTableUploadService {
break; break;
} }
let max_confirmed_root = block_commitment_cache let largest_confirmed_root = block_commitment_cache
.read() .read()
.unwrap() .unwrap()
.highest_confirmed_root(); .largest_confirmed_root();
if max_confirmed_root == starting_slot { if largest_confirmed_root == starting_slot {
std::thread::sleep(std::time::Duration::from_secs(1)); std::thread::sleep(std::time::Duration::from_secs(1));
continue; continue;
} }
@@ -63,13 +63,13 @@ impl BigTableUploadService {
blockstore.clone(), blockstore.clone(),
bigtable_ledger_storage.clone(), bigtable_ledger_storage.clone(),
starting_slot, starting_slot,
Some(max_confirmed_root), Some(largest_confirmed_root),
true, true,
exit.clone(), exit.clone(),
)); ));
match result { match result {
Ok(()) => starting_slot = max_confirmed_root, Ok(()) => starting_slot = largest_confirmed_root,
Err(err) => { Err(err) => {
warn!("bigtable: upload_confirmed_blocks: {}", err); warn!("bigtable: upload_confirmed_blocks: {}", err);
std::thread::sleep(std::time::Duration::from_secs(2)); std::thread::sleep(std::time::Duration::from_secs(2));