gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge PR #68710 into tentacle

Browse Source 
* refs/pull/68710/head:
	osd: FastEC: always update pwlc epoch when activating

Reviewed-by: bcAlex Ainscow <aainscow@uk.ibm.com>
This commit is contained in:
Patrick Donnelly 2026-05-16 11:54:35 -04:00
commit 17c7df8aad
No known key found for this signature in database
GPG Key ID: 053758C0A8A3CE2F
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.githubmap
View File

@ -208,3 +208,4 @@ aainscow Alex Ainscow <aainscow@uk.ibm.com>
Hezko Tomer Haskalovitch <tomer.haska@ibm.com>
aainscow Alex Ainscow <aainscow@uk.ibm.com>
caroav Aviv.Caro@ibm.com
aainscow bcAlex Ainscow <aainscow@uk.ibm.com>

7
src/osd/PeeringState.cc
View File

@ -2892,6 +2892,10 @@ void PeeringState::activate(
send_notify = false;
if (is_primary()) {
// Update the epoch so that pwlc used by the primary during
// peering becomes the definitive copy of pwlc
info.partial_writes_last_complete_epoch = get_osdmap_epoch();
// only update primary last_epoch_started if we will go active
if (acting_set_writeable()) {
ceph_assert(cct->_conf->osd_find_best_info_ignore_history_les ||
@ -3347,9 +3351,6 @@ void PeeringState::consider_rollback_pwlc(eversion_t last_complete)
<< info.partial_writes_last_complete[shard] << dendl;
}
}
// Update the epoch so that pwlc adjustments made by the whole
// proc_master_log process are recognized as the newest updates
info.partial_writes_last_complete_epoch = get_osdmap_epoch();
}
void PeeringState::proc_master_log(