From: Samuel Just <sjust@redhat.com>
Date: Mon, 23 Mar 2015 18:16:06 +0000 (-0700)
Subject: Revert "Merge pull request #3911 from athanatos/wip-11057"
X-Git-Tag: v0.94~19^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e4b7b0df410977b5d1e38aae78866d1e19861fd;p=ceph.git

Revert "Merge pull request #3911 from athanatos/wip-11057"

This reverts commit 05bb9c9870781941b2e362e6cb9b5ec7fb72e97e, reversing
changes made to b780048c48784a59348d030b5be720d270649a36.
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 15e1a856e245..614fdf0b6fe2 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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))) {