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

Merge pull request #2228 from ceph/wip-pg-epoch

Browse Source 
osd: fix pg epoch floor tracking

Reviewed-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Sage Weil 2014-08-08 18:17:27 -07:00
commit 790f4c2345
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/OSD.h
View File

@ -351,7 +351,7 @@ public:
Mutex::Locker l(pg_epoch_lock);
map<spg_t,epoch_t>::iterator t = pg_epoch.find(pgid);
assert(t != pg_epoch.end());
pg_epochs.erase(t->second);
pg_epochs.erase(pg_epochs.find(t->second));
t->second = epoch;
pg_epochs.insert(epoch);
}
@ -359,7 +359,7 @@ public:
Mutex::Locker l(pg_epoch_lock);
map<spg_t,epoch_t>::iterator t = pg_epoch.find(pgid);
if (t != pg_epoch.end()) {
pg_epochs.erase(t->second);
pg_epochs.erase(pg_epochs.find(t->second));
pg_epoch.erase(t);
}
}