mon: return correct state machine epoch in replies

Conflicts:

	src/mon/OSDMonitor.cc

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3f7c82cb3c5876ef320968e3037f212e4bbc0198..fa2b417dacf95d617024a1233bce47a437016bac 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1525,7 +1525,7 @@ void OSDMonitor::_pool_op(MPoolOp *m, int replyCode, epoch_t epoch)
 {
   dout(20) << "_pool_op returning with replyCode " << replyCode << dendl;
   MPoolOpReply *reply = new MPoolOpReply(m->fsid, m->get_tid(),
-                                        replyCode, epoch, mon->get_epoch());
+                                        replyCode, epoch, paxos->get_version());
   mon->send_reply(m, reply);
   delete m;
 }

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 054e754f851375344d3f0fcbc736d6d54ba30b56..2d85a01e7cfb6f877eb402748d5c0ff76dcc4e28 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -209,7 +209,7 @@ void PGMonitor::handle_statfs(MStatfs *statfs)
   }
 
   // fill out stfs
-  reply = new MStatfsReply(mon->monmap->fsid, statfs->get_tid(), mon->get_epoch());
+  reply = new MStatfsReply(mon->monmap->fsid, statfs->get_tid(), paxos->get_version());
 
   // these are in KB.
   reply->h.st.kb = pg_map.osd_sum.kb;