From: Sage Weil <sage@newdream.net>
Date: Thu, 13 May 2010 19:10:48 +0000 (-0700)
Subject: mon: return correct state machine epoch in replies
X-Git-Tag: v0.20.1~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=140284fb32b9ab8018f6ad740ee54a7603322779;p=ceph.git

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 3f7c82cb3c58..fa2b417dacf9 100644
--- 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 054e754f8513..2d85a01e7cfb 100644
--- 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;