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

mds: catch duplicates in DamageTable

Browse Source 
There was an implicit assumption in the code that callers
wouldn't hit the notify_*damaged paths twice because they would
have checked is_*_damaged paths first.

However, that's not really true in all cases, e.g. scrub
code isn't required to respect existing damage entries
when trying to load a CDir.

Simply fix this by having the DamageTable notify* functions
check the key they're inserting doesn't already exist.

Fixes: http://tracker.ceph.com/issues/17173
Signed-off-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2016-09-19 15:18:24 +01:00
parent 22053d057f
commit c9cfaef104
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mds/DamageTable.cc
View File

@ -46,10 +46,13 @@ bool DamageTable::notify_dentry(
return true;
}
DamageEntryRef entry = std::make_shared<DentryDamage>(
ino, frag, dname, snap_id);
dentries[DirFragIdent(ino, frag)][DentryIdent(dname, snap_id)] = entry;
by_id[entry->id] = entry;
auto key = DirFragIdent(ino, frag);
if (dentries.count(key) == 0) {
DamageEntryRef entry = std::make_shared<DentryDamage>(
ino, frag, dname, snap_id);
dentries[key][DentryIdent(dname, snap_id)] = entry;
by_id[entry->id] = entry;
}
return false;
}
@ -72,9 +75,12 @@ bool DamageTable::notify_dirfrag(inodeno_t ino, frag_t frag)
return true;
}
DamageEntryRef entry = std::make_shared<DirFragDamage>(ino, frag);
dirfrags[DirFragIdent(ino, frag)] = entry;
by_id[entry->id] = entry;
auto key = DirFragIdent(ino, frag);
if (dirfrags.count(key) == 0) {
DamageEntryRef entry = std::make_shared<DirFragDamage>(ino, frag);
dirfrags[key] = entry;
by_id[entry->id] = entry;
}
return false;
}
@ -85,9 +91,11 @@ bool DamageTable::notify_remote_damaged(inodeno_t ino)
return true;
}
auto entry = std::make_shared<BacktraceDamage>(ino);
remotes[ino] = entry;
by_id[entry->id] = entry;
if (remotes.count(ino) == 0) {
auto entry = std::make_shared<BacktraceDamage>(ino);
remotes[ino] = entry;
by_id[entry->id] = entry;
}
return false;
}