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 #29719 into master

Browse Source 
* refs/pull/29719/head:
	osd/PrimaryLogPG: kill obsolete ondisk_{read,write}_lock comments

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-08-19 09:09:06 -05:00
commit 329463b386
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/PrimaryLogPG.cc
View File

@ -12576,11 +12576,6 @@ int PrimaryLogPG::prep_object_replica_pushes(
ceph_assert(!recovering.count(soid));
recovering.insert(make_pair(soid, obc));
/* We need this in case there is an in progress write on the object. In fact,
* the only possible write is an update to the xattr due to a lost_revert --
* a client write would be blocked since the object is degraded.
* In almost all cases, therefore, this lock should be uncontended.
*/
int r = pgbackend->recover_object(
soid,
v,
@ -13136,7 +13131,6 @@ int PrimaryLogPG::prep_backfill_object_push(
start_recovery_op(oid);
recovering.insert(make_pair(oid, obc));
// We need to take the read_lock here in order to flush in-progress writes
int r = pgbackend->recover_object(
oid,
v,