From: Neha Ojha <nojha@redhat.com>
Date: Wed, 7 Feb 2018 01:42:54 +0000 (-0800)
Subject: PG: handle degraded object in _rollback_to()
X-Git-Tag: wip-pdonnell-testing-20180317.202121~17^2~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=20f90c5608087b5d7adf4e06c0d5b77feb5fb32e;p=ceph-ci.git

PG: handle degraded object in _rollback_to()

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index ebe8f27e3fa..abc713f0698 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -7536,6 +7536,11 @@ int PrimaryLogPG::_rollback_to(OpContext *ctx, ceph_osd_op& op)
     block_write_on_degraded_snap(missing_oid, ctx->op);
     return ret;
   }
+  if(is_degraded_or_backfilling_object(soid)) {
+    dout(10) << __func__ << " " << soid << " is a degraded or backfilling object" << dendl;
+    block_write_on_degraded_snap(soid, ctx->op);
+    return -EAGAIN;
+  }
   {
     ObjectContextRef promote_obc;
     cache_result_t tier_mode_result;