RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-01 14:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gh/next'

Browse Source
This commit is contained in:
Sage Weil 2013-03-27 21:27:16 -07:00
commit fe0a0e6fae
2 changed files with 5 additions and 1 deletions

1
src/mds/MDLog.cc
View File

@ -622,6 +622,7 @@ void MDLog::standby_trim_segments()
seg->dirty_dirfrag_dir.clear_list();
seg->dirty_dirfrag_nest.clear_list();
seg->dirty_dirfrag_dirfragtree.clear_list();
seg->update_backtraces.clear_list();
remove_oldest_segment();
removed_segment = true;
}

5
src/mds/Server.cc
View File

@ -103,7 +103,10 @@ void Server::dispatch(Message *m)
mds->enqueue_replay(new C_MDS_RetryMessage(mds, m));
return;
} else if (mds->is_clientreplay() &&
(m->get_type() == CEPH_MSG_CLIENT_SESSION ||
// session open requests need to be handled during replay,
// close requests need to be delayed
((m->get_type() == CEPH_MSG_CLIENT_SESSION &&
(static_cast<MClientSession*>(m))->get_op() != CEPH_SESSION_REQUEST_CLOSE) ||
(m->get_type() == CEPH_MSG_CLIENT_REQUEST &&
(static_cast<MClientRequest*>(m))->is_replay()))) {
// replaying!