mirror of
https://github.com/ceph/ceph
synced 2024-12-15 07:56:12 +00:00
mon: return correct state machine epoch in replies
This commit is contained in:
parent
ecc4f68679
commit
52e544bf45
@ -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();
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user