mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commitlog: Use defensive copies of segment list in iterations

Browse Source 
Fixes #8952

In 5ebf5835b0 we added a segment
prune after flushing, to deal with deadlocks in shutdown.
This means that calls that issue sync/flush-like ops "for-all",
need to operate on a defensive copy of the list.

Closes #8980
This commit is contained in:
Calle Wilund
2021-07-06 11:21:04 +00:00
committed by Piotr Sarna
parent 63a2fed585
commit ce45ffdffb
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
db/commitlog/commitlog.cc
View File

@@ -1730,7 +1730,10 @@ future<> db::commitlog::segment_manager::clear_reserve_segments() {
future<> db::commitlog::segment_manager::sync_all_segments() {
clogger.debug("Issuing sync for all segments");
return parallel_for_each(_segments, [] (sseg_ptr s) {
// #8952 - calls that do sync/cycle can end up altering
// _segments (end_flush()->discard_unused())
auto def_copy = _segments;
return parallel_for_each(def_copy, [] (sseg_ptr s) {
return s->sync().then([](sseg_ptr s) {
clogger.debug("Synced segment {}", *s);
});
@@ -1739,7 +1742,10 @@ future<> db::commitlog::segment_manager::sync_all_segments() {
future<> db::commitlog::segment_manager::shutdown_all_segments() {
clogger.debug("Issuing shutdown for all segments");
return parallel_for_each(_segments, [] (sseg_ptr s) {
// #8952 - calls that do sync/cycle can end up altering
// _segments (end_flush()->discard_unused())
auto def_copy = _segments;
return parallel_for_each(def_copy, [] (sseg_ptr s) {
return s->shutdown().then([](sseg_ptr s) {
clogger.debug("Shutdown segment {}", *s);
});
@@ -1946,7 +1952,10 @@ future<> db::commitlog::segment_manager::clear() {
*/
void db::commitlog::segment_manager::sync() {
auto f = std::exchange(_background_sync, make_ready_future<>());
_background_sync = parallel_for_each(_segments, [](sseg_ptr s) {
// #8952 - calls that do sync/cycle can end up altering
// _segments (end_flush()->discard_unused())
auto def_copy = _segments;
_background_sync = parallel_for_each(def_copy, [](sseg_ptr s) {
return s->sync().discard_result();
}).then([f = std::move(f)]() mutable {
return std::move(f);