RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 02:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #24490 into master

Browse Source 
* refs/pull/24490/head:
	mds: flush dirty dirfrags that weren't logged when deactivating mds
	mds: use MDlog::trim_all() to trim log when deactivating mds
	mds: don't cap log when there are replicated objects

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-11-13 13:03:02 -08:00
commit 0aa5566c81
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mds/MDCache.cc
View File

@ -7675,7 +7675,16 @@ bool MDCache::shutdown_pass()
// Fully trim the log so that all objects in cache are clean and may be
// trimmed by a future MDCache::trim. Note that MDSRank::tick does not
// trim the log such that the cache eventually becomes clean.
mds->mdlog->trim(0);
if (mds->mdlog->get_num_segments() > 0) {
auto ls = mds->mdlog->get_current_segment();
if (ls->num_events > 1 || !ls->dirty_dirfrags.empty()) {
// Current segment contains events other than subtreemap or
// there are dirty dirfrags (see CDir::log_mark_dirty())
mds->mdlog->start_new_segment();
mds->mdlog->flush();
}
}
mds->mdlog->trim_all();
if (mds->mdlog->get_num_segments() > 1) {
dout(7) << "still >1 segments, waiting for log to trim" << dendl;
return false;
@ -7708,6 +7717,12 @@ bool MDCache::shutdown_pass()
ceph_assert(!migrator->is_exporting());
ceph_assert(!migrator->is_importing());
// replicas may dirty scatter locks
if (myin && myin->is_replicated()) {
dout(7) << "still have replicated objects" << dendl;
return false;
}
if ((myin && myin->get_num_auth_pins()) ||
(mydir && (mydir->get_auth_pins() || mydir->get_dir_auth_pins()))) {
dout(7) << "still have auth pinned objects" << dendl;
@ -7718,9 +7733,11 @@ bool MDCache::shutdown_pass()
if (!mds->mdlog->is_capped()) {
dout(7) << "capping the log" << dendl;
mds->mdlog->cap();
mds->mdlog->trim();
}
if (!mds->mdlog->empty())
mds->mdlog->trim(0);
if (!mds->mdlog->empty()) {
dout(7) << "waiting for log to flush.. " << mds->mdlog->get_num_events()
<< " in " << mds->mdlog->get_num_segments() << " segments" << dendl;

6
src/mds/MDLog.cc
View File

@ -721,7 +721,8 @@ int MDLog::trim_all()
uint64_t last_seq = 0;
if (!segments.empty()) {
last_seq = get_last_segment_seq();
if (!mds->mdcache->open_file_table.is_any_committing() &&
if (!capped &&
!mds->mdcache->open_file_table.is_any_committing() &&
last_seq > mds->mdcache->open_file_table.get_committing_log_seq()) {
submit_mutex.Unlock();
mds->mdcache->open_file_table.commit(new C_OFT_Committed(this, last_seq),
@ -732,7 +733,8 @@ int MDLog::trim_all()
map<uint64_t,LogSegment*>::iterator p = segments.begin();
while (p != segments.end() &&
p->first < last_seq && p->second->end <= safe_pos) {
p->first < last_seq &&
p->second->end < safe_pos) { // next segment should have been started
LogSegment *ls = p->second;
++p;