From: Samuel Just <sjust@redhat.com>
Date: Mon, 23 Mar 2015 18:48:38 +0000 (-0700)
Subject: Revert "ReplicatedPG: block writes on degraded objects for ec pools"
X-Git-Tag: v0.94~19^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9cefc591180eae1ed28a90888c2aa94d1a68c92b;p=ceph.git

Revert "ReplicatedPG: block writes on degraded objects for ec pools"

This reverts commit 1f165d2547af844de8406b35e89d371d56730f09.
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c941544d7c29..a3cf228f8ed3 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1440,22 +1440,6 @@ void ReplicatedPG::do_op(OpRequestRef& op)
     return;
   }
 
-  // degraded object?
-  
-  /* We continue to block writes on degraded objects for an EC pools because
-   * we have to reset can_rollback_to when we get a repop without the
-   * transaction.  If two replicas do that on sequential ops on different
-   * objects and then crash, other unstable objects before those two would
-   * also be unable to be rolled back, and would also wind up unfound.
-   * We can enable degraded writes on ec pools by blocking such a write
-   * to a peer until all previous writes have completed.  For now, we
-   * will simply block them.
-   */
-  if (pool.info.ec_pool() && write_ordered && is_degraded_object(head)) {
-    wait_for_degraded_object(head, op);
-    return;
-  }
-
   // missing snapdir?
   hobject_t snapdir(m->get_oid(), m->get_object_locator().key,
 		    CEPH_SNAPDIR, m->get_pg().ps(), info.pgid.pool(),