emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thin restorer is now careful to share the mapping tree for empty devices.

Browse Source 
This saves a lot of metadata space if you're creating lots of empty
devs (4k per dev).  Also makes things faster since we don't have to
allocate.
This commit is contained in:
Joe Thornber 2013-05-07 14:24:59 +01:00
parent edf16f59c7
commit d113ff6e5a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
thin-provisioning/restore_emitter.cc
View File

@ -29,10 +29,13 @@ namespace {
public: public:
restorer(metadata::ptr md) restorer(metadata::ptr md)
: md_(md), : md_(md),
in_superblock_(false) { in_superblock_(false),
empty_mapping_(new_mapping_tree()) {
} }
virtual ~restorer() { virtual ~restorer() {
// FIXME: replace with a call to empty_mapping_->destroy()
md_->metadata_sm_->dec(empty_mapping_->get_root());
} }
virtual void begin_superblock(std::string const &uuid, virtual void begin_superblock(std::string const &uuid,
@ -76,9 +79,7 @@ namespace {
device_details details = {mapped_blocks, trans_id, (uint32_t)creation_time, (uint32_t)snap_time}; device_details details = {mapped_blocks, trans_id, (uint32_t)creation_time, (uint32_t)snap_time};
md_->details_->insert(key, details); md_->details_->insert(key, details);
// Insert an empty mapping tree current_mapping_ = empty_mapping_->clone();
current_mapping_.reset(new single_mapping_tree(md_->tm_,
block_time_ref_counter(md_->data_sm_)));
current_device_ = optional<uint32_t>(dev); current_device_ = optional<uint32_t>(dev);
} }
@ -121,7 +122,13 @@ namespace {
} }
private: private:
bool device_exists(thin_dev_t dev) const { single_mapping_tree::ptr new_mapping_tree() {
return single_mapping_tree::ptr(
new single_mapping_tree(md_->tm_,
block_time_ref_counter(md_->data_sm_)));
}
bool device_exists(thin_dev_t dev) const {
uint64_t key[1] = {dev}; uint64_t key[1] = {dev};
detail_tree::maybe_value v = md_->details_->lookup(key); detail_tree::maybe_value v = md_->details_->lookup(key);
return v; return v;
@ -131,6 +138,7 @@ namespace {
bool in_superblock_; bool in_superblock_;
optional<uint32_t> current_device_; optional<uint32_t> current_device_;
single_mapping_tree::ptr current_mapping_; single_mapping_tree::ptr current_mapping_;
single_mapping_tree::ptr empty_mapping_;
}; };
} }