Skip to content

Showcase 62080 tested/merged #2

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

Closed
Matan-B wants to merge 2 commits into from
Closed

Showcase 62080 tested/merged #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ee97d5
Revert "crimson/osd/pg_recovery: use OperationThrottler to throttle o…
Matan-B Apr 15, 2025
1e47920
crimson/osd/pg_recovery: use OperationThrottler to throttle object
xxhdx1985126 Apr 1, 2025
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
8 changes: 4 additions & 4 deletions src/crimson/osd/osd_operations/background_recovery.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ seastar::future<> BackgroundRecoveryT<T>::start()
return do_recovery();
}, [](std::exception_ptr) {
return seastar::make_ready_future<bool>(false);
}, pg, epoch_started).then([](bool recovery_done) {
if (recovery_done) {
return seastar::stop_iteration::yes;
} else {
}, pg, epoch_started).then([](bool goon) {
if (goon) {
return seastar::stop_iteration::no;
} else {
return seastar::stop_iteration::yes;
}
});
});
Expand Down
4 changes: 1 addition & 3 deletions src/crimson/osd/pg_recovery.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ PGRecovery::start_recovery_ops(
}
pg->reset_pglog_based_recovery_op();
}
return seastar::make_ready_future<bool>(done);
return seastar::make_ready_future<bool>(!done);
Copy link
Owner Author

@Matan-B Matan-B Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the version that was tested successfully

});
}

Expand Down Expand Up @@ -528,11 +528,9 @@ PGRecovery::recover_object_with_throttle(
crimson::osd::scheduler::params_t params =
{1, 0, crimson::osd::scheduler::scheduler_class_t::background_best_effort};
auto &ss = pg->get_shard_services();
logger().debug("{} {}", soid, need);
return ss.with_throttle(
std::move(params),
[this, soid, need] {
logger().debug("got throttle: {} {}", soid, need);
auto backend = pg->get_recovery_backend();
assert(backend);
return backend->recover_object(soid, need);
Expand Down
Loading