Skip to content

Commit 3eebce4

Browse files
authored
Merge pull request ceph#55288 from athanatos/sjust/wip-64140
Revert "crimson/os/alienstore/alien_log: _flush concurrently" Reviewed-by: Matan Breizman <[email protected]> Reviewed-by: Yingxin Cheng <[email protected]>
2 parents 5ddd51e + 4d52d1d commit 3eebce4

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/crimson/os/alienstore/alien_log.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ CnLog::~CnLog() {
1717
}
1818

1919
void CnLog::_flush(EntryVector& q, bool crash) {
20-
std::ignore = seastar::alien::submit_to(inst, shard, [&q] {
20+
// XXX: the waiting here will block the thread for an indeterministic peroid
21+
seastar::alien::submit_to(inst, shard, [&q] {
2122
for (auto& it : q) {
2223
crimson::get_logger(it.m_subsys).log(
2324
crimson::to_log_level(it.m_prio),
2425
"{}",
2526
it.strv());
2627
}
2728
return seastar::make_ready_future<>();
28-
});
29+
}).wait();
2930
q.clear();
3031
return;
3132
}

0 commit comments

Comments
 (0)