diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-05-07 16:41:22 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-05-08 11:15:45 -0700 |
| commit | 4848fac24224879bcdc4fcf202d6ab689d8d990f (patch) | |
| tree | ee0d3f0adf455d8c57bf6b662eb7eb4fcf8f3fa4 | |
| parent | dc6b9e6b2e8c1b41e982430795ff41a65a5813dc (diff) | |
| download | ceph-4848fac24224879bcdc4fcf202d6ab689d8d990f.tar.gz | |
OSD: handle stray snap collections from upgrade bug
Previously, we failed to clear snap_collections, which causes split to
spawn a bunch of snap collections. In load_pgs, we now clear any such
snap collections and then snap_collections field on the PG itself.
Related: #4927
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 8e89db89cb36a217fd97cbc1f24fd643b62400dc)
| -rw-r--r-- | src/osd/OSD.cc | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index c2a7a61b68a..cba3f6c0b16 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1775,8 +1775,29 @@ void OSD::load_pgs() dout(10) << "PG " << pg->info.pgid << " must upgrade..." << dendl; pg->upgrade(store, i->second); - } else { - assert(i->second.empty()); + } else if (!i->second.empty()) { + // handle upgrade bug + for (interval_set<snapid_t>::iterator j = i->second.begin(); + j != i->second.end(); + ++j) { + for (snapid_t k = j.get_start(); + k != j.get_start() + j.get_len(); + ++k) { + assert(store->collection_empty(coll_t(pgid, k))); + ObjectStore::Transaction t; + t.remove_collection(coll_t(pgid, k)); + store->apply_transaction(t); + } + } + } + + if (!pg->snap_collections.empty()) { + pg->snap_collections.clear(); + pg->dirty_big_info = true; + pg->dirty_info = true; + ObjectStore::Transaction t; + pg->write_if_dirty(t); + store->apply_transaction(t); } service.init_splits_between(pg->info.pgid, pg->get_osdmap(), osdmap); |