fix: Fix test_network_disconnect_during_migration test
#4224
+16
−7
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
There are actually a few failures fixed in this PR, only one of which is a test bug. Fixes #4207
|
🕺 🚀 |
kostasrim
approved these changes
Nov 28, 2024
| @@ -79,7 +81,9 @@ void JournalStreamer::Cancel() { | |||
| VLOG(1) << "JournalStreamer::Cancel"; | |||
| waker_.notifyAll(); | |||
| journal_->UnregisterOnChange(journal_cb_id_); | |||
| WaitForInflightToComplete(); | |||
| if (!cntx_->IsCancelled()) { | |||
| WaitForInflightToComplete(); | |||
There was a problem hiding this comment.
I was about to write that maybe we should move cntx_->IsCancelled() within WaitForInFlightToComplete but then I realized it's only called in this place so not really needed I guess
| @@ -41,7 +41,9 @@ JournalStreamer::JournalStreamer(journal::Journal* journal, Context* cntx) | |||
| } | |||
|
|
|||
| JournalStreamer::~JournalStreamer() { | |||
| DCHECK_EQ(in_flight_bytes_, 0u); | |||
| if (!cntx_->IsCancelled()) { | |||
| DCHECK_EQ(in_flight_bytes_, 0u); | |||
There was a problem hiding this comment.
How did we not trigger this before ? Or did we just deadlocked because WaitForInFlightToCOmplete() would never progress ?
| @@ -112,6 +112,8 @@ MultiCommandSquasher::SquashResult MultiCommandSquasher::TrySquash(StoredCmd* cm | |||
|
|
|||
| cmd->Fill(&tmp_keylist_); | |||
| auto args = absl::MakeSpan(tmp_keylist_); | |||
| if (args.size() == 0) | |||
There was a problem hiding this comment.
Curious, didn't DetermineKeys below handle this case or ?
Also general small nits (I do not care if you apply this or not 😄 )
spancontainsempty()- We can also use
NumArgs()and avoid the two calls above.
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 are actually a few failures fixed in this PR, only one of which is a test bug.
Fixes #4207