RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-15 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11578 from jcsp/wip-backtrace-repair

Browse Source 
mds: repair backtraces during scrub

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
John Spray 2016-10-24 11:53:47 +01:00 committed by GitHub
commit 7001eeef45
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mds/CInode.cc
View File

@ -3813,6 +3813,9 @@ void CInode::validate_disk_state(CInode::validated_data *results,
bool equivalent, divergent;
int memory_newer;
MDCache *mdcache = in->mdcache; // For the benefit of dout
const inode_t& inode = in->inode; // For the benefit of dout
// Ignore rval because it's the result of a FAILOK operation
// from fetch_backtrace_and_tag: the real result is in
// backtrace.ondisk_read_retval
@ -3828,6 +3831,7 @@ void CInode::validate_disk_state(CInode::validated_data *results,
try {
bufferlist::iterator p = bl.begin();
::decode(results->backtrace.ondisk_value, p);
dout(10) << "decoded " << bl.length() << " bytes of backtrace successfully" << dendl;
} catch (buffer::error&) {
if (results->backtrace.ondisk_read_retval == 0 && rval != 0) {
// Cases where something has clearly gone wrong with the overall
@ -3854,11 +3858,19 @@ void CInode::validate_disk_state(CInode::validated_data *results,
}
}
next:
if (!results->backtrace.passed && in->scrub_infop->header->get_repair()) {
std::string path;
in->make_path_string(path);
in->mdcache->mds->clog->warn() << "bad backtrace on inode " << *in
<< ", rewriting it at " << path;
in->_mark_dirty_parent(in->mdcache->mds->mdlog->get_current_segment(),
false);
}
// If the inode's number was free in the InoTable, fix that
// (#15619)
{
const inode_t& inode = in->inode;
MDCache *mdcache = in->mdcache;
InoTable *inotable = mdcache->mds->inotable;
dout(10) << "scrub: inotable ino = 0x" << std::hex << inode.ino << dendl;