From: Samuel Just <sam.just@inktank.com>
Date: Sun, 6 Apr 2014 20:38:52 +0000 (-0700)
Subject: ReplicatedPG: do not evict head while clone is being promoted
X-Git-Tag: v0.80-rc1~89^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07099ecd4c17bccf7fe1ce08031e774a0270fd99;p=ceph.git

ReplicatedPG: do not evict head while clone is being promoted

Fixes: #8003
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 403bf0306750..0ca33370430f 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4469,6 +4469,11 @@ int ReplicatedPG::_verify_no_head_clones(const hobject_t& soid,
 	       << clone_oid << dendl;
       return -EBUSY;
     }
+    if (copy_ops.count(clone_oid)) {
+      dout(10) << __func__ << " cannot evict head, pending promote on clone "
+	       << clone_oid << dendl;
+      return -EBUSY;
+    }
   }
   return 0;
 }