Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify/sync dump with authority store #3494

Merged
merged 8 commits into from
Jul 26, 2022
Merged

Unify/sync dump with authority store #3494

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3202f3a
Unify store and dump
oxade Jul 26, 2022
a21b2aa
sync to main
oxade Jul 26, 2022
00dbbdf
sync to main
oxade Jul 26, 2022
0078775
Comments
oxade Jul 26, 2022
00d6aa0
typos in comments and logs
oxade Jul 26, 2022
fe5d505
Update crates/sui-core/src/authority/authority_store_tables.rs
oxade Jul 26, 2022
758e748
typo
oxade Jul 26, 2022
d3d0f3b
typo
oxade Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
typos in comments and logs
  • Loading branch information
@oxade
oxade authored Jul 26, 2022
commit 00d6aa0bd37efd79b73dfc13575d2b0ca596a445
14 changes: 7 additions & 7 deletions crates/sui-core/src/authority.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@ impl AuthorityMetrics {
.unwrap(),
follower_items_streamed: register_int_counter_with_registry!(
"follower_items_streamed",
"Number of transactions/signed .tables.batches streamed to followers",
"Number of transactions/signed batches streamed to followers",
registry,
)
.unwrap(),
follower_items_loaded: register_int_counter_with_registry!(
"follower_items_loaded",
"Number of transactions/signed .tables.batches loaded from db to be streamed to followers",
"Number of transactions/signed batches loaded from db to be streamed to followers",
registry,
)
.unwrap(),
Expand Down Expand Up @@ -294,7 +294,7 @@ pub struct AuthorityState {

// Structures needed for handling batching and notifications.
/// The sender to notify of new transactions
/// and create .tables.batches for this authority.
/// and create batches for this authority.
/// Keep as None if there is no need for this.
pub(crate) batch_channels: BroadcastSender, // TODO: remove pub

Expand Down Expand Up @@ -895,7 +895,7 @@ impl AuthorityState {
}

/// Handles a request for a batch info. It returns a sequence of
/// [.tables.batches, transactions, .tables.batches, transactions] as UpdateItems, and a flag
/// [batches, transactions, batches, transactions] as UpdateItems, and a flag
/// that if true indicates the request goes beyond the last batch in the
/// database.
pub async fn handle_batch_info_request(
Expand Down Expand Up @@ -1065,10 +1065,10 @@ impl AuthorityState {

state
.init_batches_from_database()
.expect("Init .tables.batches failed!");
.expect("Init batches failed!");

// If a checkpoint store is present, ensure it is up-to-date with the latest
// .tables.batches.
// batches.
if let Some(checkpoint) = &state.checkpoints {
let next_expected_tx = checkpoint.lock().next_transaction_sequence_expected();

Expand All @@ -1079,7 +1079,7 @@ impl AuthorityState {
.batches
.iter()
.skip_to(&next_expected_tx)
.expect("Seeking .tables.batches should never fail at this point")
.expect("Seeking batches should never fail at this point")
{
let transactions: Vec<(TxSequenceNumber, ExecutionDigests)> = state
.database
Expand Down