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

mds: call damaged() on what were assertions in replay

Browse Source 
i.e. categorize an unreplayable journal as a damaged rank.

NB there will be other cases where replay can assert out
while calling into other classes, but that's for another day.

Signed-off-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2015-03-19 20:41:36 +00:00
parent 6bf1ce76eb
commit 73b591ad90
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mds/journal.cc
View File

@ -1169,7 +1169,9 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg, MDSlaveUpdate *slaveup)
dout(10) << "EMetaBlob.replay created base " << *diri << dendl;
} else {
dout(0) << "EMetaBlob.replay missing dir ino " << (*lp).ino << dendl;
assert(0);
mds->clog->error() << "failure replaying journal (EMetaBlob)";
mds->damaged();
assert(0); // Should be unreachable because damaged() calls respawn()
}
}
@ -1880,7 +1882,9 @@ void ETableServer::replay(MDS *mds)
server->_server_update(mutation);
break;
default:
assert(0);
mds->clog->error() << "invalid tableserver op in ETableServer";
mds->damaged();
assert(0); // Should be unreachable because damaged() calls respawn()
}
assert(version == server->get_version());
@ -2435,7 +2439,9 @@ void ESlaveUpdate::replay(MDS *mds)
break;
default:
assert(0);
mds->clog->error() << "invalid op in ESlaveUpdate";
mds->damaged();
assert(0); // Should be unreachable because damaged() calls respawn()
}
}
@ -2936,10 +2942,13 @@ void EImportFinish::replay(MDS *mds)
mds->mdcache->try_trim_non_auth_subtree(dir);
}
} else {
// this shouldn't happen unless this is an old journal
dout(10) << "EImportFinish.replay " << base << " success=" << success
<< " on subtree not marked as ambiguous"
<< dendl;
assert(0 == "this shouldn't happen unless this is an old journal");
mds->clog->error() << "failure replaying journal (EImportFinish)";
mds->damaged();
assert(0); // Should be unreachable because damaged() calls respawn()
}
}