mirror of
https://github.com/ceph/ceph
synced 2025-03-21 17:57:38 +00:00
Merge pull request #8423 from wjin/fix
osdmap: rm nonused variable Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
commit
79582b04f6
@ -2641,7 +2641,7 @@ int OSDMap::build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
|
|||||||
set_max_osd(nosd);
|
set_max_osd(nosd);
|
||||||
} else {
|
} else {
|
||||||
// count osds
|
// count osds
|
||||||
int maxosd = 0, numosd = 0;
|
int maxosd = 0;
|
||||||
const md_config_t *conf = cct->_conf;
|
const md_config_t *conf = cct->_conf;
|
||||||
vector<string> sections;
|
vector<string> sections;
|
||||||
conf->get_all_sections(sections);
|
conf->get_all_sections(sections);
|
||||||
@ -2659,7 +2659,7 @@ int OSDMap::build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
|
|||||||
lderr(cct) << "[osd." << o << "] in config has id > mon_max_osd " << cct->_conf->mon_max_osd << dendl;
|
lderr(cct) << "[osd." << o << "] in config has id > mon_max_osd " << cct->_conf->mon_max_osd << dendl;
|
||||||
return -ERANGE;
|
return -ERANGE;
|
||||||
}
|
}
|
||||||
numosd++;
|
|
||||||
if (o > maxosd)
|
if (o > maxosd)
|
||||||
maxosd = o;
|
maxosd = o;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user