Impose limit on batch request size #879
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
njgheorghita
force-pushed
the
batch-limit
branch
from
c2222fc to
ae94c15
Compare
mrferris
approved these changes
Sep 3, 2023
portal-bridge/src/pandaops.rs
Outdated
| @@ -45,6 +47,23 @@ impl PandaOpsMiddleware { | |||
| /// multiple async requests. Using "ureq" consistently resulted in errors as soon as the number of | |||
| /// concurrent tasks increased significantly. | |||
| pub async fn batch_request(&self, obj: Vec<JsonRequest>) -> anyhow::Result<String> { | |||
| let futs = obj | |||
There was a problem hiding this comment.
Suggested change
| let futs = obj | |
| let batched_request_futures = obj |
portal-bridge/src/pandaops.rs
Outdated
| .chunks(BATCH_LIMIT) | ||
| .map(|chunk| self.batch_request_100(chunk.to_vec())) | ||
| .collect::<Vec<_>>(); | ||
| match futures::future::join_all(futs).await.into_iter().try_fold( |
There was a problem hiding this comment.
I'd use futures::future::join_all instead of inlining
portal-bridge/src/pandaops.rs
Outdated
| @@ -45,6 +47,23 @@ impl PandaOpsMiddleware { | |||
| /// multiple async requests. Using "ureq" consistently resulted in errors as soon as the number of | |||
| /// concurrent tasks increased significantly. | |||
| pub async fn batch_request(&self, obj: Vec<JsonRequest>) -> anyhow::Result<String> { | |||
There was a problem hiding this comment.
Suggested change
| pub async fn batch_request(&self, obj: Vec<JsonRequest>) -> anyhow::Result<String> { | |
| pub async fn batch_requests(&self, obj: Vec<JsonRequest>) -> anyhow::Result<String> { |
nit: I think that this name makes more sense given the new behavior
portal-bridge/src/pandaops.rs
Outdated
| } | ||
| } | ||
|
|
||
| async fn batch_request_100(&self, obj: Vec<JsonRequest>) -> anyhow::Result<Vec<Value>> { |
There was a problem hiding this comment.
Suggested change
| async fn batch_request_100(&self, obj: Vec<JsonRequest>) -> anyhow::Result<Vec<Value>> { | |
| async fn send_requests(&self, requests: Vec<JsonRequest>) -> anyhow::Result<Vec<Value>> { | |
| if requests.len() > BATCH_LIMIT { warn!("Attempting to send requests outnumbering pandaops limit") } |
ogenev
approved these changes
Sep 4, 2023
| use serde_json::json; | ||
| use serde_json::{json, Value}; | ||
|
|
||
| const BATCH_LIMIT: usize = 100; |
There was a problem hiding this comment.
A short docstring will be useful here to describe this const.
portal-bridge/src/pandaops.rs
Outdated
| } | ||
| } | ||
|
|
||
| async fn batch_request_100(&self, obj: Vec<JsonRequest>) -> anyhow::Result<Vec<Value>> { |
There was a problem hiding this comment.
if we change the BATCH_LIMIT const this function name will not be relevant anymore.
njgheorghita
force-pushed
the
batch-limit
branch
from
2824f2c to
fbbb6e8
Compare
njgheorghita
force-pushed
the
batch-limit
branch
from
fbbb6e8 to
64c1a33
Compare
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
What was wrong?
Fixes #830
Batch requests to a panda-ops provider of > 100 were failing as those clients are configured to handle a max of 100 batch requests at a time.
This bug was the reason why our bridge has not been pumping out receipts. Can confirm that bridge now gossips receipts as expected.
How was it fixed?
Add a limit to haw many pandaops requests can be batched into a single request.
To-Do