]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "Merge pull request #3911 from athanatos/wip-11057"
authorSamuel Just <sjust@redhat.com>
Mon, 23 Mar 2015 18:16:06 +0000 (11:16 -0700)
committerSamuel Just <sjust@redhat.com>
Mon, 23 Mar 2015 18:16:06 +0000 (11:16 -0700)
This reverts commit 05bb9c9870781941b2e362e6cb9b5ec7fb72e97e, reversing
changes made to b780048c48784a59348d030b5be720d270649a36.

src/osd/ReplicatedPG.cc

index 15e1a856e2452766abb837445399d8861fd12316..614fdf0b6fe20624af903aa6e38115b998c73158 100644 (file)
@@ -1487,7 +1487,6 @@ 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))) {