Consolidate ack checking #1561
Merged
Consolidate ack checking #1561
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
jmpesp
approved these changes
Nov 15, 2024
upstairs/src/client.rs
Outdated
| // snapshot exists already but we should not increment | ||
| // `downstairs_errors` and transition that Downstairs to | ||
| // Failed - that downstairs is still able to serve IO. | ||
| (_, CrucibleError::SnapshotExistsAlready(..)) => (), |
There was a problem hiding this comment.
Not matching on Flush here?
There was a problem hiding this comment.
This matches the previous behavior (L1296), but I agree that we could be more specific; fixed!
(Note that this only handles error counters, the actual error checking in the Downstairs remains agnostic to IOop type)
| @@ -474,12 +474,77 @@ impl Downstairs { | |||
| } | |||
| } | |||
|
|
|||
| /// Checks whether an ack and/or a retire check is necessary for the job | |||
There was a problem hiding this comment.
This is exactly the follow up to 1552 I was going to chat to you about, but it was next in the queue :) 👍
mkeeter
force-pushed
the
mkeeter/immediate-ack
branch
from
4b0a34e to
a33bee3
Compare
mkeeter
force-pushed
the
mkeeter/consolidate-ack
branch
from
c065ec2 to
f3d07aa
Compare
faithanalog
approved these changes
Nov 15, 2024
|
it seems CI may not agree with us on these changes |
|
CI weirdness appears to be #1390 (or similar) |
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.
(staged on top of #1552)
There are a bunch of places where we check to see if jobs should be acked and/or retired:
Downstairs::enqueue(if skipped on all three Downstairs)Downstairs::skip_all_jobs(for skipped jobs only)DownstairsClient::process_io_completion(lots of conditionals to decide if we're ready to ack; returns a flag toDownstairs::process_io_completion_inner)This PR consolidates ack and retire checks into a single place:
Downstairs::ack_check. This new function is responsible for deciding when to ack and retire jobs; it's called in all of the places where you'd expect.DownstairsClient::process_io_completionis reorganized, with one minor logical change: non-fatal read errors now increment thedownstairs_errorscounter. It's no longer responsible for deciding when to ack a job; that's now inDownstairs::ack_check.The
up-to-ds-*-doneDTrace probes are removed, because (after #1552) they fire immediately before the equivalentgw-*-doneprobes; there's no delay waiting for ackable jobs to be acked.