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

[garbage_colection] Fix crash in clear_resharding_data while fetching prev_epoch_id #10195

Merged
merged 3 commits into from
Nov 17, 2023
Merged

[garbage_colection] Fix crash in clear_resharding_data while fetching prev_epoch_id #10195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fb0c0f
[garbage_colection] Fix crash in clear_resharding_data while fetching…
Nov 17, 2023
1bec71a
mini fix
Nov 17, 2023
d67b415
Update comments
Nov 17, 2023
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
23 changes: 19 additions & 4 deletions chain/chain/src/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2343,10 +2343,25 @@ impl<'a> ChainStoreUpdate<'a> {
if !epoch_manager.is_next_block_epoch_start(&block_hash)? {
return Ok(());
}
let epoch_id = epoch_manager.get_epoch_id(&block_hash)?;
let shard_layout = epoch_manager.get_shard_layout(&epoch_id)?;
let prev_epoch_id = epoch_manager.get_prev_epoch_id(&block_hash)?;
let prev_shard_layout = epoch_manager.get_shard_layout(&prev_epoch_id)?;

// Since this code is related to GC, we need to be careful about accessing block_infos. Note
// that the BlockInfo exists for the current block_hash as it's not been GC'd yet.
// However, we need to use the block header to get the epoch_id and shard_layout for
// first_block_epoch_header and last_block_prev_epoch_hash as BlockInfo for these blocks is
// already GC'd while BlockHeader isn't GC'd.
let block_info = epoch_manager.get_block_info(&block_hash)?;
let first_block_epoch_hash = block_info.epoch_first_block();
if first_block_epoch_hash == &CryptoHash::default() {
return Ok(());
}
let first_block_epoch_header = self.get_block_header(first_block_epoch_hash)?;
let last_block_prev_epoch_header =
self.get_block_header(first_block_epoch_header.prev_hash())?;

let epoch_id = first_block_epoch_header.epoch_id();
let shard_layout = epoch_manager.get_shard_layout(epoch_id)?;
let prev_epoch_id = last_block_prev_epoch_header.epoch_id();
let prev_shard_layout = epoch_manager.get_shard_layout(prev_epoch_id)?;
if shard_layout == prev_shard_layout {
return Ok(());
}
Expand Down
7 changes: 0 additions & 7 deletions chain/chain/src/test_utils/kv_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,13 +615,6 @@ impl EpochManagerAdapter for MockEpochManager {
}
}

fn get_prev_epoch_id(&self, block_hash: &CryptoHash) -> Result<EpochId, EpochError> {
let header = self
.get_block_header(block_hash)?
.ok_or_else(|| EpochError::MissingBlock(*block_hash))?;
self.get_prev_epoch_id_from_prev_block(header.prev_hash())
}

fn get_prev_epoch_id_from_prev_block(
&self,
prev_block_hash: &CryptoHash,
Expand Down
7 changes: 0 additions & 7 deletions chain/epoch-manager/src/adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ pub trait EpochManagerAdapter: Send + Sync {
/// Get epoch start from a block belonging to the epoch.
fn get_epoch_start_height(&self, block_hash: &CryptoHash) -> Result<BlockHeight, EpochError>;

fn get_prev_epoch_id(&self, block_hash: &CryptoHash) -> Result<EpochId, EpochError>;

/// Get previous epoch id by hash of previous block.
fn get_prev_epoch_id_from_prev_block(
&self,
Expand Down Expand Up @@ -561,11 +559,6 @@ impl EpochManagerAdapter for EpochManagerHandle {
epoch_manager.get_epoch_start_height(block_hash)
}

fn get_prev_epoch_id(&self, block_hash: &CryptoHash) -> Result<EpochId, EpochError> {
let epoch_manager = self.read();
epoch_manager.get_prev_epoch_id(block_hash)
}

fn get_prev_epoch_id_from_prev_block(
&self,
prev_block_hash: &CryptoHash,
Expand Down