fix(uploader): fix for mismatched ordering of instructions #1858
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
maqi
reviewed
Jun 7, 2024
| // | ||
| // We cannot just disobey the instruction inside the child loop, as the mainloop would be expecting | ||
| // a result back for a particular instruction. | ||
| if !make_payments { |
There was a problem hiding this comment.
use if cost_map.is_empty() { will be more readable ?
| if !make_payments { | ||
| got_a_previous_force_payment = true; | ||
| warn!( | ||
| "We were told to force make payment, but cost_map is empty, so we can't do that just yet. Waiting for a task to insert a quote into cost_map" |
There was a problem hiding this comment.
the msg actually shall be:
We were told cost_map is empty, i.e. no more payment to be maid
| // We cannot just disobey the instruction inside the child loop, as the mainloop would be expecting | ||
| // a result back for a particular instruction. | ||
| if !make_payments { | ||
| got_a_previous_force_payment = true; |
There was a problem hiding this comment.
better rename the var to be cost_map_was_emptied
| make_payments | ||
| }; | ||
|
|
||
| if make_payments { | ||
| // reset force_make_payment | ||
| if got_a_previous_force_payment { | ||
| info!("A task inserted a quote into cost_map, so we can now make a forced round of payment!"); |
There was a problem hiding this comment.
better change the comment msg to be:
New quote inserted into cost_map, after it was emptied, we shall make a forced round of payment
| while let Some(payment) = make_payment_receiver.recv().await { | ||
| let make_payments = if let Some((item, quote)) = payment { | ||
| let xorname = item.xorname(); | ||
| trace!("Inserted {xorname:?} into cost_map"); | ||
|
|
||
| current_batch.push((xorname, quote.clone())); | ||
| let _ = cost_map.insert(xorname, (quote.1, quote.2, quote.0.to_bytes())); | ||
| cost_map.len() >= batch_size | ||
| cost_map.len() >= batch_size || got_a_previous_force_payment | ||
| } else { | ||
| // using None to indicate as all paid. |
There was a problem hiding this comment.
better update the comment to be :
When the received `payment` is `None`, it notifies no more payment to be made.
There shall be a round of `forced payment` to pay the remaining payments in the cost_map (less than batch_size)
With normal order, there shall be no more payment come in afterwards,
however it could be break due to async channel send.
Hence have to catering such `out-of-order` situation.
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.
There can be a mismatch of ordering between the main loop and the make payment loop because
the instructions are sent via a task(channel.send().await). And there is no guarantee for the
order to come in the same order as they were sent.
We cannot just disobey the instruction inside the child loop, as the mainloop would be expecting
a result back for a particular instruction.