Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary argument #1672

Merged
merged 1 commit into from
Mar 17, 2025
Merged

Remove unnecessary argument #1672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions upstairs/src/downstairs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,11 +1016,7 @@ impl Downstairs {
///
/// This function is idempotent; it returns without doing anything if
/// live-repair either can't be started or is already running.
pub(crate) fn check_live_repair_start(
&mut self,
up_state: &UpstairsState,
extent_count: u32,
) {
pub(crate) fn check_live_repair_start(&mut self, up_state: &UpstairsState) {
// If we're already doing live-repair, then we can't start live-repair
if self.live_repair_in_progress() {
return;
Expand Down Expand Up @@ -1067,7 +1063,7 @@ impl Downstairs {
// Submit the initial repair jobs, which kicks everything off
self.begin_repair_for(
ExtentId(0),
Some(extent_count),
Some(self.ddef.unwrap().extent_count()),
false,
&repair_downstairs,
source_downstairs,
Expand Down Expand Up @@ -9760,7 +9756,7 @@ pub(crate) mod test {

// Start the repair normally. This enqueues the close & reopen jobs, and
// reserves Job IDs for the repair/noop
ds.check_live_repair_start(&UpstairsState::Active, 3);
ds.check_live_repair_start(&UpstairsState::Active);
assert!(ds.live_repair_in_progress());

// Submit a write.
Expand Down
5 changes: 1 addition & 4 deletions upstairs/src/upstairs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,10 +918,7 @@ impl Upstairs {
}

// Try to start live-repair
self.downstairs.check_live_repair_start(
&self.state,
self.ddef.get_def().unwrap().extent_count(),
);
self.downstairs.check_live_repair_start(&self.state);
}

/// Returns `true` if we're ready to accept guest IO
Expand Down