smeb_y/0g-storage-node
1
0
Fork 0
mirror of https://github.com/0glabs/0g-storage-node.git synced 2024-12-26 00:05:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wait for tx to be processed in pruner. (#267)
Some checks are pending
abi-consistent-check / build-and-compare (push) Waiting to run
Details
code-coverage / unittest-cov (push) Waiting to run
Details
rust / check (push) Waiting to run
Details
rust / test (push) Waiting to run
Details
rust / lints (push) Waiting to run
Details
functional-test / test (push) Waiting to run
Details

Browse Source 
* Wait for tx to be processed in pruner.

* Put FIRST_REWARDABLE_CHUNK_KEY in data db.
This commit is contained in:
peilun-conflux 2024-11-14 02:58:59 +08:00 committed by GitHub
parent f4d5228234
commit 1046fed088
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
node/pruner/src/lib.rs
View File

@ -11,7 +11,7 @@ use std::str::FromStr;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use storage::config::{ShardConfig, SHARD_CONFIG_KEY}; use storage::config::{ShardConfig, SHARD_CONFIG_KEY};
use storage::log_store::log_manager::{DATA_DB_KEY, FLOW_DB_KEY, PORA_CHUNK_SIZE}; use storage::log_store::log_manager::{DATA_DB_KEY, PORA_CHUNK_SIZE};
use storage_async::Store; use storage_async::Store;
use task_executor::TaskExecutor; use task_executor::TaskExecutor;
use tokio::sync::{broadcast, mpsc}; use tokio::sync::{broadcast, mpsc};
@ -223,21 +223,26 @@ impl Pruner {
} }
async fn prune_tx(&mut self, start_sector: u64, end_sector: u64) -> Result<()> { async fn prune_tx(&mut self, start_sector: u64, end_sector: u64) -> Result<()> {
while let Some(tx) = self.store.get_tx_by_seq_number(self.first_tx_seq).await? { loop {
// If a part of the tx data is pruned, we mark the tx as pruned. if let Some(tx) = self.store.get_tx_by_seq_number(self.first_tx_seq).await? {
if tx.start_entry_index() >= start_sector && tx.start_entry_index() < end_sector { // If a part of the tx data is pruned, we mark the tx as pruned.
self.store.prune_tx(tx.seq).await?; if tx.start_entry_index() >= start_sector && tx.start_entry_index() < end_sector {
} else if tx.start_entry_index() >= end_sector { self.store.prune_tx(tx.seq).await?;
break; } else if tx.start_entry_index() >= end_sector {
break;
} else {
bail!(
"prune tx out of range: tx={:?}, start={} end={}",
tx,
start_sector,
end_sector
);
}
self.first_tx_seq += 1;
} else { } else {
bail!( // Wait for `first_tx_seq` to be processed.
"prune tx out of range: tx={:?}, start={} end={}", tokio::time::sleep(Duration::from_secs(60)).await;
tx,
start_sector,
end_sector
);
} }
self.first_tx_seq += 1;
} }
Ok(()) Ok(())
} }
@ -265,7 +270,7 @@ impl Pruner {
.set_config_encoded( .set_config_encoded(
&FIRST_REWARDABLE_CHUNK_KEY, &FIRST_REWARDABLE_CHUNK_KEY,
&(new_first_rewardable_chunk, new_first_tx_seq), &(new_first_rewardable_chunk, new_first_tx_seq),
FLOW_DB_KEY, DATA_DB_KEY,
) )
.await .await
} }
@ -279,7 +284,7 @@ async fn get_shard_config(store: &Store) -> Result<Option<ShardConfig>> {
async fn get_first_rewardable_chunk(store: &Store) -> Result<Option<(u64, u64)>> { async fn get_first_rewardable_chunk(store: &Store) -> Result<Option<(u64, u64)>> {
store store
.get_config_decoded(&FIRST_REWARDABLE_CHUNK_KEY, FLOW_DB_KEY) .get_config_decoded(&FIRST_REWARDABLE_CHUNK_KEY, DATA_DB_KEY)
.await .await
} }