From: Sage Weil <sage@inktank.com>
Date: Fri, 27 Dec 2013 23:41:47 +0000 (-0800)
Subject: osd/ReplicatedPG: construct appropriate snapc for flush/writeback
X-Git-Tag: v0.77~22^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2f752a9e1e69bc2c40fb60a2801b8d3531932a7;p=ceph.git

osd/ReplicatedPG: construct appropriate snapc for flush/writeback

Construct a snap context that will trigger the appropriate cloning (if any)
on the base pool.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c8b0eb54746..780bfd6f844 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5331,7 +5331,22 @@ int ReplicatedPG::start_flush(OpContext *ctx, bool blocking)
   C_Flush *fin = new C_Flush(this, soid, get_last_peering_reset());
   object_locator_t base_oloc(soid);
   base_oloc.pool = pool.info.tier_of;
-  SnapContext snapc;  // FIXME
+
+  // construct a SnapContext appropriate for this clone/head
+  SnapContext snapc;
+  if (soid.snap == CEPH_NOSNAP) {
+    snapc.seq = snapset.seq;
+    snapc.snaps = snapset.snaps;
+  } else {
+    // we want to only include snaps that are older than the oldest
+    // snap for which we are defined, so that the object appears to
+    // have been written before that.
+    vector<snapid_t>::iterator p = snapset.snaps.begin();
+    while (p != snapset.snaps.end() && *p >= oi.snaps.back())
+      p++;
+    snapc.snaps = vector<snapid_t>(p, snapset.snaps.end());
+    snapc.seq = oi.snaps.back() - 1;
+  }
 
   osd->objecter_lock.Lock();
   tid_t tid = osd->objecter->mutate(soid.oid, base_oloc, o, snapc, oi.mtime,