smeb_y/0g-storage-node
1
0
Fork 0
mirror of https://github.com/0glabs/0g-storage-node.git synced 2024-11-20 15:05:19 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

check error messages (#176)
Some checks failed
abi-consistent-check / build-and-compare (push) Has been cancelled
Details
code-coverage / unittest-cov (push) Has been cancelled
Details
rust / check (push) Has been cancelled
Details
rust / test (push) Has been cancelled
Details
rust / lints (push) Has been cancelled
Details
functional-test / test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
0g-peterzhb 2024-08-30 17:28:34 +08:00 committed by GitHub
parent 508e787bd0
commit e3c199d361
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
node/log_entry_sync/src/sync_manager/log_query.rs
View File

@ -14,7 +14,7 @@ use thiserror::Error;
pub(crate) type PinBoxFut<'a, T> = pub(crate) type PinBoxFut<'a, T> =
Pin<Box<dyn Future<Output = Result<T, ProviderError>> + Send + 'a>>; Pin<Box<dyn Future<Output = Result<T, ProviderError>> + Send + 'a>>;
const TOO_MANY_LOGS_ERROR_MSG: &str = "query returned more than"; const TOO_MANY_LOGS_ERROR_MSG: [&str; 2] = ["query returned more than", "too large with more than"];
/// A log query provides streaming access to historical logs via a paginated /// A log query provides streaming access to historical logs via a paginated
/// request. For streaming access to future logs, use [`Middleware::watch`] or /// request. For streaming access to future logs, use [`Middleware::watch`] or
@ -127,7 +127,7 @@ where
// this is okay because we will only enter this state when the filter is // this is okay because we will only enter this state when the filter is
// paginatable i.e. from block is set // paginatable i.e. from block is set
let from_block = self.filter.get_from_block().unwrap(); let from_block = self.filter.get_from_block().unwrap();
let to_block = min(from_block + self.page_size, last_block); let to_block = min(from_block + self.page_size - 1, last_block);
self.from_block = Some(to_block + 1); self.from_block = Some(to_block + 1);
let filter = self let filter = self
@ -159,13 +159,14 @@ where
rewake_with_new_state!(ctx, self, LogQueryState::Consume); rewake_with_new_state!(ctx, self, LogQueryState::Consume);
} }
Err(err) => { Err(err) => {
if err.to_string().contains(TOO_MANY_LOGS_ERROR_MSG) { for msg in TOO_MANY_LOGS_ERROR_MSG.iter() {
self.from_block = *from_block; if err.to_string().contains(msg) {
self.page_size /= 2; self.from_block = *from_block;
rewake_with_new_state!(ctx, self, LogQueryState::Consume); self.page_size /= 2;
} else { rewake_with_new_state!(ctx, self, LogQueryState::Consume);
Poll::Ready(Some(Err(LogQueryError::LoadLogsError(err)))) }
} }
Poll::Ready(Some(Err(LogQueryError::LoadLogsError(err))))
} }
} }
} }
@ -181,9 +182,9 @@ where
let from_block = self.from_block.unwrap(); let from_block = self.from_block.unwrap();
let to_block = if let Some(l) = self.last_block { let to_block = if let Some(l) = self.last_block {
// if last_block is not none, only getLogs from to_block to last_block // if last_block is not none, only getLogs from to_block to last_block
min(from_block + self.page_size, l) min(from_block + self.page_size - 1, l)
} else { } else {
from_block + self.page_size from_block + self.page_size - 1
}; };
// no more pages to load, and everything is consumed // no more pages to load, and everything is consumed