[Indexer-Grpc-V2] Add FileStoreUploader. #15724
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
⏱️ 11m total CI duration on this PR
|
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
Comment on lines
+106
to
+151
| pub(crate) async fn start(&mut self, data_manager: Arc<DataManager>) -> Result<()> { | ||
| let (version, batch_metadata) = self.recover().await?; | ||
|
|
||
| let mut file_store_operator = FileStoreOperatorV2::new( | ||
| MAX_SIZE_PER_FILE, | ||
| NUM_TXNS_PER_FOLDER, | ||
| version, | ||
| batch_metadata, | ||
| ) | ||
| .await; | ||
| tokio_scoped::scope(|s| { | ||
| let (tx, mut rx) = channel(5); | ||
| s.spawn(async move { | ||
| while let Some((transactions, batch_metadata, end_batch)) = rx.recv().await { | ||
| self.do_upload(transactions, batch_metadata, end_batch) | ||
| .await | ||
| .unwrap(); | ||
| } | ||
| }); | ||
| s.spawn(async move { | ||
| loop { | ||
| let transactions = data_manager | ||
| .get_transactions_from_cache( | ||
| file_store_operator.version(), | ||
| MAX_SIZE_PER_FILE, | ||
| /*update_file_store_version=*/ true, | ||
| ) | ||
| .await; | ||
| let len = transactions.len(); | ||
| for transaction in transactions { | ||
| file_store_operator | ||
| .buffer_and_maybe_dump_transactions_to_file(transaction, tx.clone()) | ||
| .await | ||
| .unwrap(); | ||
| } | ||
| if len == 0 { | ||
| tokio::time::sleep(Duration::from_millis(100)).await; | ||
| } | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| Ok(()) | ||
| } |
There was a problem hiding this comment.
The start() method spawns infinite tasks within tokio_scoped::scope but returns immediately, which causes the tasks to be terminated prematurely. Since these tasks need to run continuously, they should either:
- Use
tokio::spawninstead of scoped tasks, or - Have the method wait for a shutdown signal before returning
This will ensure the background processing continues running as intended rather than being cleaned up when the scope exits.
Spotted by Graphite Reviewer
Is this helpful? React 👍 or 👎 to let us know.
grao1991
force-pushed
the
grao_file_store
branch
from
1da097d to
edf179e
Compare
grao1991
force-pushed
the
grao_file_store
branch
6 times, most recently
from
302d973 to
d9eb878
Compare
grao1991
changed the title
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
larry-aptos
approved these changes
Jan 22, 2025
| }) | ||
| } | ||
|
|
||
| async fn recover(&self) -> Result<(u64, BatchMetadata)> { |
There was a problem hiding this comment.
nit: add some comments.
| .await; | ||
| } | ||
|
|
||
| if update_batch_metadata { |
There was a problem hiding this comment.
nit: write in the other way and flatten the nested logic.
if !update_batch_metadata {
// no update can be performed.
return Ok(()):
}
// the rest.
| batch_metadata, | ||
| ) | ||
| .await; | ||
| tokio_scoped::scope(|s| { |
There was a problem hiding this comment.
it looks like tokio_scoped is no longer maintained; maybe async_scoped?
areshand
approved these changes
Jan 23, 2025
grao1991
force-pushed
the
grao_file_store
branch
from
d9eb878 to
beb5cd8
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ Forge suite
|
✅ Forge suite
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
How Has This Been Tested?
Key Areas to Review
Type of Change
Which Components or Systems Does This Change Impact?
Checklist