kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-06-17 02:24:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove needless asserts that had occasionally caused issues in stress tests

Browse Source
This commit is contained in:
Jude Nelson
2024-03-14 12:35:34 -04:00
parent c17586a86c
commit 6fe1873b60
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
stackslib/src/net/stackerdb/sync.rs
View File

@@ -248,7 +248,12 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
let local_write_timestamps = self
.stackerdbs
.get_slot_write_timestamps(&self.smart_contract_id)?;
assert_eq!(local_slot_versions.len(), local_write_timestamps.len());
if local_slot_versions.len() != local_write_timestamps.len() {
let msg = format!("Local slot versions ({}) out of sync with DB slot versions ({}); abandoning sync and trying again", local_slot_versions.len(), local_write_timestamps.len());
warn!("{}", &msg);
return Err(net_error::Transient(msg));
}
let mut need_chunks: HashMap<usize, (StackerDBGetChunkData, Vec<NeighborAddress>)> =
HashMap::new();
@@ -270,11 +275,10 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
}
for (naddr, chunk_inv) in self.chunk_invs.iter() {
assert_eq!(
chunk_inv.slot_versions.len(),
local_slot_versions.len(),
"FATAL: did not validate StackerDBChunkInvData"
);
if chunk_inv.slot_versions.len() != local_slot_versions.len() {
// remote peer and our DB are out of sync, so just skip this
continue;
}
if *local_version >= chunk_inv.slot_versions[i] {
// remote peer has same view as local peer, or stale
@@ -358,11 +362,10 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
for (i, local_version) in local_slot_versions.iter().enumerate() {
let mut local_chunk = None;
for (naddr, chunk_inv) in self.chunk_invs.iter() {
assert_eq!(
chunk_inv.slot_versions.len(),
local_slot_versions.len(),
"FATAL: did not validate StackerDBChunkData"
);
if chunk_inv.slot_versions.len() != local_slot_versions.len() {
// remote peer and our DB are out of sync, so just skip this
continue;
}
if *local_version <= chunk_inv.slot_versions[i] {
// remote peer has same or newer view than local peer

2
stackslib/src/util_lib/db.rs
View File

@@ -730,7 +730,7 @@ pub fn get_ancestor_block_hash<T: MarfTrieId>(
block_height: u64,
tip_block_hash: &T,
) -> Result<Option<T>, Error> {
assert!(block_height < u32::MAX as u64);
assert!(block_height <= u32::MAX as u64);
let mut read_only = index.reopen_readonly()?;
let bh = read_only.get_block_at_height(block_height as u32, tip_block_hash)?;
Ok(bh)