diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-05-09 17:25:57 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-05-09 22:23:46 -0700 |
| commit | 01a07c1ee1ea2ef134f5fddf19518eb3c0349b53 (patch) | |
| tree | aca71620218133170288475aa8f5a754ef5cb3b2 | |
| parent | f5a60ca2266c27a182444f737ff1d905d7dd1141 (diff) | |
| download | ceph-01a07c1ee1ea2ef134f5fddf19518eb3c0349b53.tar.gz | |
OSD: rename clear_temp to recursive_remove_collection()
Signed-off-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/OSD.cc | 10 | ||||
| -rw-r--r-- | src/osd/OSD.h | 2 | ||||
| -rw-r--r-- | src/tools/ceph-filestore-dump.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e7e52e431d5..91842926f44 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -455,7 +455,7 @@ int OSD::convert_collection(ObjectStore *store, coll_t cid) store->apply_transaction(t); } - clear_temp(store, tmp1); + recursive_remove_collection(store, tmp1); store->sync_and_flush(); store->sync(); return 0; @@ -486,10 +486,10 @@ int OSD::do_convertfs(ObjectStore *store) ++i) { pg_t pgid; if (i->is_temp(pgid)) - clear_temp(store, *i); + recursive_remove_collection(store, *i); else if (i->to_str() == "convertfs_temp" || i->to_str() == "convertfs_temp1") - clear_temp(store, *i); + recursive_remove_collection(store, *i); } store->flush(); @@ -1505,7 +1505,7 @@ int OSD::read_superblock() -void OSD::clear_temp(ObjectStore *store, coll_t tmp) +void OSD::recursive_remove_collection(ObjectStore *store, coll_t tmp) { OSDriver driver( store, @@ -1727,7 +1727,7 @@ void OSD::load_pgs() if (it->is_temp(pgid) || it->is_removal(&seq, &pgid)) { dout(10) << "load_pgs " << *it << " clearing temp" << dendl; - clear_temp(store, *it); + recursive_remove_collection(store, *it); continue; } diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 528896a73a5..a4c2bf8c900 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -630,7 +630,7 @@ public: hobject_t oid(sobject_t("infos", CEPH_NOSNAP)); return oid; } - static void clear_temp(ObjectStore *store, coll_t tmp); + static void recursive_remove_collection(ObjectStore *store, coll_t tmp); private: diff --git a/src/tools/ceph-filestore-dump.cc b/src/tools/ceph-filestore-dump.cc index cbde3a52d47..b63799a0e1f 100644 --- a/src/tools/ceph-filestore-dump.cc +++ b/src/tools/ceph-filestore-dump.cc @@ -396,7 +396,7 @@ int finish_remove_pgs(ObjectStore *store, uint64_t *next_removal_seq) if (it->is_temp(pgid)) { cout << "finish_remove_pgs " << *it << " clearing temp" << std::endl; - OSD::clear_temp(store, *it); + OSD::recursive_remove_collection(store, *it); continue; } |