RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cls/journal: skip disconnected clients when finding min_commit_position

Browse Source 
When a new journal client is registered, all already registered
clients are checked, and a client with min position is selected
as a position for the new client. Thus we may expect that
starting from the registered position all journal entries will be
available (not trimmed) for the new client.

But when looking for a min commit position, the client_register
function did not take into account that a registered client might
be in disconnected state, and in that case the journal entries
might be trimmed for this client.

Fixes: https://tracker.ceph.com/issues/53888
Signed-off-by: Mykola Golub <mgolub@suse.com>
This commit is contained in:
Mykola Golub 2022-01-14 18:21:29 +00:00
parent 0bd3c05c95
commit 078d72e5e6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cls/journal/cls_journal.cc
View File

@ -271,11 +271,12 @@ int find_min_commit_position(cls_method_context_t hctx,
}
start_after = batch.rbegin()->id;
// update the (minimum) commit position from this batch of clients
for(std::set<cls::journal::Client>::iterator it = batch.begin();
it != batch.end(); ++it) {
cls::journal::ObjectSetPosition object_set_position = (*it).commit_position;
for (const auto &client : batch) {
if (client.state == cls::journal::CLIENT_STATE_DISCONNECTED) {
continue;
}
const auto &object_set_position = client.commit_position;
if (object_set_position.object_positions.empty()) {
*minset = cls::journal::ObjectSetPosition();
break;