]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
bug fix: osd: requeue_scrub when kick_object_context_blocked 5891/head
authorXinze Chi <xmdxcxz@gmail.com>
Wed, 29 Jul 2015 08:28:33 +0000 (16:28 +0800)
committerAbhishek Varshney <abhishek.varshney@flipkart.com>
Mon, 21 Sep 2015 11:17:27 +0000 (16:47 +0530)
commite8cce089102abd8ec1b8e916c6f2c4a5b339cbd3
treea390fb649369fb2e374639bcd399309519715c02
parent2b11a4c07a9416a2f75c8ce62a923994977d799c
bug fix: osd: requeue_scrub when kick_object_context_blocked

when read miss in writeback cache pool, osd do_proxy_read first
and maybe promote it. but in this case, the op is not added to
waiting_for_blocked_object. pg scrub maybe block by this object
(_range_available_for_scrub). so after promote it, we should
requeue_scrub.

Fixes: 12515
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit f77949fedce3449befd74efeb5270579f5085b16)

Conflicts:
src/osd/ReplicatedPG.cc
in ReplicatedPG::kick_object_context_blocked, removed hobject_t::BitwiseComparator from map p
src/osd/ReplicatedPG.cc