From e7107ce07f113653cc1d276da9451314e38a2635 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 23 Jul 2015 15:31:23 -0700 Subject: [PATCH] Revert "osd: set the blocked_by relationship when rolling back to a degraded" This reverts commit 48dacd75566f64cb89f991ac4d05e2e50c4e73e0. --- src/osd/ReplicatedPG.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 329cc67dfc84e..7d68fe069e5e2 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -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) { -- 2.39.5