From 975c8007d01cc742815d8c0b8f9651c56ecee053 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 7 May 2009 16:06:50 -0700
Subject: [PATCH] osd: set snapid in read requests

---
 src/messages/MOSDOp.h | 6 +++++-
 src/osdc/Objecter.cc  | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index 72d46d5a401b4..dcfcd50638ea0 100644
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -41,6 +41,7 @@ public:
 
   // read
   snapid_t get_snapid() { return snapid_t(head.snapid); }
+  void set_snapid(snapid_t s) { head.snapid = s; }
   // writ
   snapid_t get_snap_seq() { return snapid_t(head.snap_seq); }
   vector<snapid_t> &get_snaps() { return snaps; }
@@ -176,7 +177,10 @@ public:
   const char *get_type_name() { return "osd_op"; }
   void print(ostream& out) {
     out << "osd_op(" << get_reqid();
-    out << " " << head.oid << " " << ops;
+    out << " " << head.oid;
+    if (!is_modify())
+      out << " @" << snapid_t((__u64)head.snapid);
+    out << " " << ops;
     out << " " << pg_t(head.layout.ol_pgid);
     if (is_retry_attempt()) out << " RETRY";
     if (!snaps.empty())
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index d32fc78d9b5b4..266669fcc2fb9 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -391,6 +391,7 @@ tid_t Objecter::read_submit(ReadOp *rd)
     MOSDOp *m = new MOSDOp(client_inc, last_tid,
 			   rd->oid, rd->layout, osdmap->get_epoch(), 
 			   flags);
+    m->set_snapid(rd->snap);
     m->ops = rd->ops;
     m->set_data(rd->bl);
     if (inc_lock > 0) {
-- 
2.39.5