smeb_y/0g-storage-node
1
0
Fork 0
mirror of https://github.com/0glabs/0g-storage-node.git synced 2025-11-03 16:17:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fill all middle seqs

Browse Source
This commit is contained in:
Peter Zhang 2025-07-08 16:53:49 +08:00
parent 1381428aee
commit 74f44e21d4
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/setup-rust/action.yml vendored
View File

@ -8,11 +8,11 @@ runs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y protobuf-compiler sudo apt-get install -y protobuf-compiler
- name: Install toolchain 1.80.0 - name: Install toolchain 1.78.0
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: 1.80.0 toolchain: 1.78.0
components: rustfmt, clippy components: rustfmt, clippy
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2

13
node/storage/src/log_store/log_manager.rs
View File

@ -319,11 +319,11 @@ impl LogStoreWrite for LogManager {
// If this is the first tx with this data root, copy and finalize all same-root txs. // If this is the first tx with this data root, copy and finalize all same-root txs.
self.copy_tx_and_finalize(tx_seq, same_root_seq_list[1..].to_vec())?; self.copy_tx_and_finalize(tx_seq, same_root_seq_list[1..].to_vec())?;
} else { } else {
// If this is not the first tx with this data root, copy and finalize the first one. // If this is not the first tx with this data root, and the first one is not finalized.
let maybe_first_seq = same_root_seq_list.first().cloned(); let maybe_first_seq = same_root_seq_list.first().cloned();
if let Some(first_seq) = maybe_first_seq { if let Some(first_seq) = maybe_first_seq {
if !self.check_tx_completed(first_seq)? { if !self.check_tx_completed(first_seq)? {
self.copy_tx_and_finalize(tx_seq, vec![first_seq])?; self.copy_tx_and_finalize(tx_seq, same_root_seq_list)?;
} }
} }
} }
@ -357,7 +357,6 @@ impl LogStoreWrite for LogManager {
// TODO: Should we double check the tx merkle root? // TODO: Should we double check the tx merkle root?
let tx_end_index = tx.start_entry_index + bytes_to_entries(tx.size); let tx_end_index = tx.start_entry_index + bytes_to_entries(tx.size);
if self.check_data_completed(tx.start_entry_index, tx_end_index)? { if self.check_data_completed(tx.start_entry_index, tx_end_index)? {
self.tx_store.finalize_tx(tx_seq)?;
let same_root_seq_list = self let same_root_seq_list = self
.tx_store .tx_store
.get_tx_seq_list_by_data_root(&tx.data_merkle_root)?; .get_tx_seq_list_by_data_root(&tx.data_merkle_root)?;
@ -370,11 +369,13 @@ impl LogStoreWrite for LogManager {
let maybe_first_seq = same_root_seq_list.first().cloned(); let maybe_first_seq = same_root_seq_list.first().cloned();
if let Some(first_seq) = maybe_first_seq { if let Some(first_seq) = maybe_first_seq {
if !self.check_tx_completed(first_seq)? { if !self.check_tx_completed(first_seq)? {
self.copy_tx_and_finalize(tx_seq, vec![first_seq])?; self.copy_tx_and_finalize(tx_seq, same_root_seq_list)?;
} }
} }
} }
self.tx_store.finalize_tx(tx_seq)?;
metrics::FINALIZE_TX_WITH_HASH.update_since(start_time); metrics::FINALIZE_TX_WITH_HASH.update_since(start_time);
Ok(true) Ok(true)
} else { } else {
@ -1194,8 +1195,8 @@ impl LogManager {
let mut to_tx_offset_list = Vec::with_capacity(to_tx_seq_list.len()); let mut to_tx_offset_list = Vec::with_capacity(to_tx_seq_list.len());
for seq in to_tx_seq_list { for seq in to_tx_seq_list {
// No need to copy data for completed tx. // No need to copy data for completed tx and itself
if self.check_tx_completed(seq)? { if self.check_tx_completed(seq)? || from_tx_seq == seq {
continue; continue;
} }
let tx = self let tx = self

2
tests/utility/utils.py
View File

@ -11,7 +11,7 @@ class PortMin:
n = 11000 n = 11000
MAX_NODES = 100 MAX_NODES = 50
MAX_BLOCKCHAIN_NODES = 50 MAX_BLOCKCHAIN_NODES = 50