RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 00:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43146 from jianwei1216/fix-partial-recovery-become-whole-object-recovery-for-master

Browse Source 
osd: fix partial recovery become whole object recovery after restart osd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Kefu Chai 2021-09-15 23:17:29 +08:00 committed by GitHub
commit b70647e879
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osd/PGLog.cc
View File

@ -938,8 +938,7 @@ void PGLog::_write_log_and_missing(
if (!missing.is_missing(obj, &item)) {
to_remove.insert(key);
} else {
uint64_t features = missing.may_include_deletes ? CEPH_FEATURE_OSD_RECOVERY_DELETES : 0;
encode(make_pair(obj, item), (*km)[key], features);
encode(make_pair(obj, item), (*km)[key], CEPH_FEATUREMASK_SERVER_OCTOPUS);
}
});
if (require_rollback) {