RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix metadata loading error if we open an image

Browse Source 
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
This commit is contained in:
xinxin shu 2015-08-17 13:14:08 +08:00
parent b224eb455a
commit 68d47f2565
1 changed files with 9 additions and 10 deletions

19
src/librbd/ImageCtx.cc
View File

@ -819,13 +819,10 @@ public:
return false;
string key = it->first.substr(conf_prefix_len, it->first.size() - conf_prefix_len);
for (map<string, bool>::iterator cit = configs.begin();
cit != configs.end(); ++cit) {
if (!key.compare(cit->first)) {
cit->second = true;
res->insert(make_pair(key, it->second));
break;
}
map<string, bool>::iterator cit = configs.find(key);
if ( cit != configs.end()) {
cit->second = true;
res->insert(make_pair(key, it->second));
}
}
return true;
@ -882,20 +879,22 @@ public:
pairs, &res);
for (map<string, bufferlist>::iterator it = res.begin();
it != res.end(); ++it) {
j = local_config_t.set_val(it->first.c_str(), it->second.c_str());
string val(it->second.c_str(), it->second.length());
j = local_config_t.set_val(it->first.c_str(), val);
if (j < 0) {
lderr(cct) << __func__ << " failed to set config " << it->first
<< " with value " << it->second.c_str() << ": " << j
<< dendl;
}
break;
}
start = pairs.rbegin()->first;
}
#define ASSIGN_OPTION(config) \
do { \
if (configs[#config]) \
string key = "rbd_"; \
key = key + #config; \
if (configs[key]) \
config = local_config_t.rbd_##config; \
else \
config = cct->_conf->rbd_##config; \