Track both jobs and bytes in each IO state #1507
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
mkeeter
force-pushed
the
mkeeter/io-state-job-and-byte-count
branch
2 times, most recently
from
22a663c
to
7b7ec22
Compare
leftwo
approved these changes
Oct 16, 2024
upstairs/src/client.rs
Outdated
| @@ -2252,7 +2279,8 @@ impl DownstairsClient { | |||
| } | |||
|
|
|||
| pub(crate) fn total_live_work(&self) -> usize { | |||
| (self.io_state_count.new + self.io_state_count.in_progress) as usize | |||
| (self.io_state_job_count.new + self.io_state_job_count.in_progress) | |||
There was a problem hiding this comment.
I don't know how this snuck through, but the io_state_job_count.new has no IOState equivalent any longer. Since your in the neighborhood can you just remove the new field from ClientIOStateCount?
There was a problem hiding this comment.
Good catch, removed in 663ae0d
This will change the DTrace probe format, but it looks like no one is using ok.ds_io_count.new
upstairs/src/lib.rs
Outdated
| pub error: u32, | ||
| #[derive(Debug, Default, Copy, Clone, Serialize, Deserialize)] | ||
| pub struct ClientIOStateCount<T = u32> { | ||
| pub new: T, |
There was a problem hiding this comment.
Yeah, the new here is now vestigial and we can remove it.
mkeeter
force-pushed
the
mkeeter/io-state-job-and-byte-count
branch
from
7b7ec22
to
1e4cc53
Compare
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.
It would be helpful to track how many bytes are associated with each job state, so that we can inject
Barrieroperations if we're buffering too manyDonebytes. This PR adds a new counter for that purpose!io_state_byte_count: ClientIOStateCount<u64>to track number of bytes associated with each IO stateClientIOStateCountto be generic, instead ofu32-specificClientIOStateCountto useIndexMutio_state_counttoio_state_job_countinDownstairsClientDownstairsIO::io_size()just call intoIOop::job_bytes(), which does the same thing