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

ReplicatedPG: remove from snap_collections even without objects to trim

Browse Source 
Also, make sure to write_info after updating snap_collections.

Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2012-11-15 13:35:47 -08:00
parent 8218d8ac0b
commit 206f39e3b8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osd/ReplicatedPG.cc
View File

@ -7064,10 +7064,15 @@ boost::statechart::result ReplicatedPG::NotTrimming::react(const SnapTrim&)
dout(10) << "NotTrimming: obs_to_trim empty!" << dendl;
dout(10) << "purged_snaps now " << pg->info.purged_snaps << ", snap_trimq now "
<< pg->snap_trimq << dendl;
ObjectStore::Transaction *t = new ObjectStore::Transaction;
t->remove_collection(col_to_trim);
int r = pg->osd->store->queue_transaction(NULL, t, new ObjectStore::C_DeleteTransaction(t));
assert(r == 0);
if (pg->snap_collections.contains(snap_to_trim)) {
ObjectStore::Transaction *t = new ObjectStore::Transaction;
pg->snap_collections.erase(snap_to_trim);
t->remove_collection(col_to_trim);
pg->write_info(*t);
int r = pg->osd->store->queue_transaction(
NULL, t, new ObjectStore::C_DeleteTransaction(t));
assert(r == 0);
}
post_event(SnapTrim());
return discard_event();
} else {
@ -7118,9 +7123,10 @@ boost::statechart::result ReplicatedPG::RepColTrim::react(const SnapTrim&)
t->collection_remove(col_to_trim, *i);
}
t->remove_collection(col_to_trim);
pg->snap_collections.erase(snap_to_trim);
pg->write_info(*t);
int r = pg->osd->store->queue_transaction(NULL, t, new ObjectStore::C_DeleteTransaction(t));
assert(r == 0);
pg->snap_collections.erase(snap_to_trim);
return discard_event();
}