mirror of
https://github.com/0glabs/0g-storage-node.git
synced 2025-01-12 16:15:17 +00:00
fix python tests
This commit is contained in:
parent
c85d8ff7ed
commit
73c56629a5
@ -284,7 +284,12 @@ impl SerialBatcher {
|
|||||||
let origin = self.next_tx_seq_in_db.load(Ordering::Relaxed);
|
let origin = self.next_tx_seq_in_db.load(Ordering::Relaxed);
|
||||||
let mut current = origin;
|
let mut current = origin;
|
||||||
|
|
||||||
while let Some(&sync_result) = self.pending_completed_txs.read().await.get(¤t) {
|
loop {
|
||||||
|
let sync_result = match self.pending_completed_txs.read().await.get(¤t) {
|
||||||
|
Some(&v) => v,
|
||||||
|
None => break,
|
||||||
|
};
|
||||||
|
|
||||||
// downgrade to random sync if file sync failed or timeout
|
// downgrade to random sync if file sync failed or timeout
|
||||||
if matches!(sync_result, SyncResult::Failed | SyncResult::Timeout) {
|
if matches!(sync_result, SyncResult::Failed | SyncResult::Timeout) {
|
||||||
self.sync_store.add_pending_tx(current).await?;
|
self.sync_store.add_pending_tx(current).await?;
|
||||||
|
@ -48,15 +48,16 @@ impl AutoSyncManager {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// sync randomly
|
// sync randomly
|
||||||
let random = RandomBatcher::new(config, store.clone(), sync_send.clone(), sync_store);
|
let random = RandomBatcher::new(config, store, sync_send, sync_store);
|
||||||
executor.spawn(random.clone().start(catched_up.clone()), "auto_sync_random");
|
executor.spawn(random.clone().start(catched_up.clone()), "auto_sync_random");
|
||||||
|
|
||||||
// handle on catched up notification
|
// handle on catched up notification
|
||||||
executor.spawn(
|
executor.spawn(
|
||||||
async move {
|
async move {
|
||||||
catch_up_end_recv.await.expect("Catch up sender dropped");
|
if catch_up_end_recv.await.is_ok() {
|
||||||
info!("log entry catched up");
|
info!("log entry catched up");
|
||||||
catched_up.store(true, Ordering::Relaxed);
|
catched_up.store(true, Ordering::Relaxed);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"auto_sync_wait_for_catchup",
|
"auto_sync_wait_for_catchup",
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user