]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd: set the blocked_by relationship when rolling back to a degraded"
authorSamuel Just <sjust@redhat.com>
Thu, 23 Jul 2015 22:31:23 +0000 (15:31 -0700)
committerSamuel Just <sjust@redhat.com>
Tue, 18 Aug 2015 18:25:24 +0000 (11:25 -0700)
This reverts commit 48dacd75566f64cb89f991ac4d05e2e50c4e73e0.

src/osd/ReplicatedPG.cc

index 329cc67dfc84e077ec1081d0c5b24875f7719f77..7d68fe069e5e2c4fd062b96855cf22f2c3a004be 100644 (file)
@@ -5520,8 +5520,6 @@ int ReplicatedPG::_rollback_to(OpContext *ctx, ceph_osd_op& op)
     if (is_degraded_or_backfilling_object(rollback_to_sobject)) {
       dout(20) << "_rollback_to attempted to roll back to a degraded object "
               << rollback_to_sobject << " (requested snapid: ) " << snapid << dendl;
-      ctx->obc->blocked_by = rollback_to;
-      rollback_to->blocking.insert(ctx->obc);
       wait_for_degraded_object(rollback_to_sobject, ctx->op);
       ret = -EAGAIN;
     } else if (rollback_to->obs.oi.soid.snap == CEPH_NOSNAP) {