mon: return correct state machine epoch in replies

This commit is contained in:
Sage Weil 2010-05-13 10:47:07 -07:00
parent ecc4f68679
commit 52e544bf45
2 changed files with 2 additions and 2 deletions

View File

@ -1566,7 +1566,7 @@ void OSDMonitor::_pool_op(MPoolOp *m, int replyCode, epoch_t epoch, bufferlist *
{
dout(20) << "_pool_op returning with replyCode " << replyCode << dendl;
MPoolOpReply *reply = new MPoolOpReply(m->fsid, m->get_tid(),
replyCode, epoch, mon->get_epoch(), blp);
replyCode, epoch, paxos->get_version(), blp);
mon->send_reply(m, reply);
m->put();
}

View File

@ -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;