Merge pull request #3911 from athanatos/wip-11057

ReplicatedPG: block write on degraded object if there are waiters

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-03-09 19:43:02 -07:00
commit 05bb9c9870

View File

@ -1487,6 +1487,7 @@ void ReplicatedPG::do_op(OpRequestRef& op)
if (write_ordered &&
is_degraded_object(head, &valid_copies) &&
(valid_copies < pool.info.min_size ||
waiting_for_degraded_object.count(head) ||
pool.info.ec_pool() ||
!cct->_conf->osd_enable_degraded_writes ||
!(get_min_peer_features() & CEPH_FEATURE_OSD_DEGRADED_WRITES))) {