RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: scrub: no need to expect snapdir objects

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-08-31 17:21:01 -04:00
parent b196d38783
commit 2c71964096
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osd/PG.cc
View File

@ -3834,7 +3834,8 @@ void PG::_scan_snaps(ScrubMap &smap)
const hobject_t &hoid = i->first;
ScrubMap::object &o = i->second;
if (hoid.is_head() || hoid.is_snapdir()) {
assert(!hoid.is_snapdir());
if (hoid.is_head()) {
// parse the SnapSet
bufferlist bl;
if (o.attrs.find(SS_ATTR) == o.attrs.end()) {

3
src/osd/PGBackend.cc
View File

@ -820,7 +820,8 @@ map<pg_shard_t, ScrubMap *>::const_iterator
}
// We won't pick an auth copy if the snapset is missing or won't decode.
if (obj.is_head() || obj.is_snapdir()) {
assert(!obj.is_snapdir());
if (obj.is_head()) {
k = i->second.attrs.find(SS_ATTR);
if (k == i->second.attrs.end()) {
shard_info.set_ss_attr_missing();