osdc/Objecter: track latest epoch in op_target_t

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index d83bcf17b50a330b81d20439ba8515e7702ccf4f..87dd5aa6fab11317cf91e05b75efda414e214dca 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2661,7 +2661,9 @@ int Objecter::_calc_target(op_target_t *t, Connection *con, bool any_change)
   // rwlock is locked
   bool is_read = t->flags & CEPH_OSD_FLAG_READ;
   bool is_write = t->flags & CEPH_OSD_FLAG_WRITE;
-  ldout(cct,20) << __func__ << " base " << t->base_oid << " " << t->base_oloc
+  t->epoch = osdmap->get_epoch();
+  ldout(cct,20) << __func__ << " epoch " << t->epoch
+               << " base " << t->base_oid << " " << t->base_oloc
                << " precalc_pgid " << (int)t->precalc_pgid
                << " pgid " << t->base_pgid
                << (is_read ? " is_read" : "")

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index fc8dce0304cdc9a0e6a67812fba9d33d9bffb8be..bea8d136abe11f2f2608d87bebdf1011f0f55d29 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1182,6 +1182,9 @@ public:
 
   struct op_target_t {
     int flags = 0;
+
+    epoch_t epoch = 0;  ///< latest epoch we calculated the mapping
+
     object_t base_oid;
     object_locator_t base_oloc;
     object_t target_oid;